19426 files changed, 10952 insertions, 1787 deletions

diff --git a/.gitignore b/.gitignore
index b3ae9e6ea863..750baebf4151 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,2 @@
-*~
-,*
-.*.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/COPYING b/COPYING
index 9a73903d6df1..a306d8d92e11 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2019 Eelco Dolstra and the Nixpkgs/NixOS contributors
+Copyright (c) 2018 Alyssa Ross
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/README b/README
new file mode 100644
index 000000000000..bc0c4caad83d
--- /dev/null
+++ b/README
@@ -0,0 +1,62 @@
+                        ===================
+                        Alyssa's collection
+                        of Nix expressions.
+                        ===================
+
+This is a large collection of Nix expressions.
+
+The primary way to use the expressions is by applying a profile to a
+NixOS or nix-darwin system. See the sys directory for available
+profiles.  A profile can be installed on a system using the `activate'
+script.
+
+These profiles are structured in a way that is very different to NixOS
+configurations in several respects.  First, rather than setting NIX_PATH
+to a mutable tree, these profiles copy the tree into the Nix store at
+build time, then set NIX_PATH to point to that.  This means that
+angle-bracket path syntax (e.g. <nixpkgs>) points to exactly the
+expression that it pointed to when the system was built.  To use a
+mutable working tree in Nix expressions, relative or absolute paths can
+be used instead.  Another advantage of doing things this way is that the
+Nix expressions used to build a given system can always be recovered
+from the Nix store, since they will be a dependency of the system
+derivation.
+
+Whereas NixOS configurations are typically made up of configuration
+files along with seperate repositories or channels for Nixpkgs (and
+possibly some overlays), here a single tree is used.  This means that
+version control history will always be able to identify which version
+of Nixpkgs is compatible with which version of the configuration files,
+while also allowing custom downstream changes to be made to Nixpkgs.
+No other approach provides both of these features in such a convenient
+way.  With the exception of some custom modifications, any upstream
+trees (Nixpkgs, various overlays) are left intact in the tree, for ease
+of patch generation against those upstream trees.  The structure of the
+tree is deliberately designed so that it can be used as a single entry
+in a NIX_PATH.  <nixpkgs> will automatically point to the nixpkgs
+subdirectory, and it will automatically load the overlays in the
+nixpkgs-overlays subdirectory through <nixpkgs-overlays>.  Other
+structures would be possible, but only this one has this feature, and so
+it made sense to choose it.
+
+In constrast to NixOS, an attempt is made here to assist with per-user
+application state management through the `home' and `xdg' modules.  The
+`xdg' module allows creating an immutable XDG_CONFIG_HOME in
+/run/current-system, which allows environment.etc-like management of
+per-user configuration files, without introducing a new, seperate build
+command à la home-manager.  The disadvantage to this approach is that,
+unlike home-manager, it assumes that the user has permission to rebuild
+the entire NixOS system.  The `home' module allows activation scripts to
+be defined on a per-directory basis inside a user's home.  For programs
+like gpg, which require configuration files to be in the same directory
+as mutable program state, this approach allows configuration to be
+stored read-only in the Nix store, and then symlinked into the state
+directory, allowing this type of program to still realise some of the
+benefits of Nix-based configuration.
+
+Note: MIT license does not apply to the packages built by Nixpkgs,
+merely to the package descriptions (Nix expressions, build scripts, and
+so on). It also might not apply to patches included in the tree, which
+may be derivative works of the packages to which they apply. The
+aforementioned artifacts are all covered by the licenses of the
+respective packages.
diff --git a/activate b/activate
new file mode 100755
index 000000000000..34ee918ce475
--- /dev/null
+++ b/activate
@@ -0,0 +1,26 @@
+#! /usr/bin/env bash
+
+# IMPORTANT: Don't use nix-shell shebang!
+# If a config has generated an invalid NIX_PATH, it still needs to be
+# possible to rescue the system by activating a different configuration.
+
+set -ueo pipefail
+
+d="$(dirname $0)"
+
+if [ "$#" -eq 0 ]; then
+    echo -e "\e[31;1merror:\e[0m must specify a system definition" >&2
+    echo "Available system definitions are:" >&2
+    find $d/sys -name '*.nix' | awk -F / '{print "- " $NF}' | sed 's/\.nix$//' >&2
+    exit 1
+fi
+
+sys="$1"
+shift
+
+export NIX_PATH=nixos-config=$d/sys/$sys.nix:$d
+link="$(mktemp -d)/result"
+nix build -f '<nixpkgs/nixos>' --out-link "$link" "$@" system
+path="$(readlink "$link")"
+nix-env -p /nix/var/nix/profiles/system --set "$path"
+exec "$path/bin/switch-to-configuration" switch
diff --git a/default.nix b/default.nix
index a74a01719c73..439a3d30cb20 100644
--- a/default.nix
+++ b/default.nix
@@ -1,28 +1,16 @@
-let requiredVersion = import ./lib/minver.nix; in
+{ overlays ? [] } @ args:
 
-if ! builtins ? nixVersion || builtins.compareVersions requiredVersion builtins.nixVersion == 1 then
+let
+  inherit (builtins) attrNames filter match pathExists readDir;
 
-  abort ''
+  path = ./nixpkgs-overlays;
 
-    This version of Nixpkgs requires Nix >= ${requiredVersion}, please upgrade:
+  overlayPaths =
+    filter
+      (n: match ".*\\.nix" n != null || pathExists (path + "/${n}/default.nix"))
+      (attrNames (readDir path));
 
-    - 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
+in
+  import ./nixpkgs (args // {
+    overlays = (map (n: import (path + "/${n}")) overlayPaths) ++ overlays;
+  })
diff --git a/modules/default.nix b/modules/default.nix
new file mode 100644
index 000000000000..eae333ea34b2
--- /dev/null
+++ b/modules/default.nix
@@ -0,0 +1 @@
+import ../nixpkgs/nixos
diff --git a/modules/home/default.nix b/modules/home/default.nix
new file mode 100644
index 000000000000..780bac85b334
--- /dev/null
+++ b/modules/home/default.nix
@@ -0,0 +1,89 @@
+{ lib, config, ... }:
+
+let
+  inherit (lib) attrValues concatStringsSep mapAttrsToList mkOption
+                optionalString recursiveUpdate;
+  inherit (lib.types) bool loaOf nullOr str submodule;
+
+  dirOpts = { ... }: {
+    options = {
+      owner = mkOption {
+        default = null;
+        type = nullOr str;
+      };
+      group = mkOption {
+        default = null;
+        type = nullOr str;
+      };
+      permissions = mkOption {
+        default = "0700";
+        type = str;
+      };
+      activationScripts = mkOption {
+        default = {};
+        type = loaOf str;
+      };
+    };
+  };
+
+  applyDirConfig = user: dir:
+    let
+      owner = if dir.owner == null
+              then user
+              else config.users.users.${dir.owner};
+
+      group = if dir.group == null then owner.group else dir.group;
+    in
+      ''
+        chmod ${dir.permissions} .
+        chown ${owner.name}:${group} .
+        ${concatStringsSep "\n" (attrValues dir.activationScripts)}
+      '';
+
+in
+  {
+    options = {
+      home = mkOption {
+        default = {};
+        type = loaOf (submodule (args: recursiveUpdate (dirOpts args) {
+          options = {
+            imperativeNix = mkOption {
+              default = false;
+              type = bool;
+            };
+            dirs = mkOption {
+              default = {};
+              type = loaOf (submodule dirOpts);
+            };
+          };
+        }));
+      };
+    };
+
+    config = {
+      system.activationScripts.home = {
+        deps = [];
+        text = concatStringsSep "\n" (mapAttrsToList
+          (key: home:
+            let
+              user = config.users.users.${key};
+
+            in ''
+              ${optionalString (!home.imperativeNix) ''
+                rm -rf ${user.home}/.nix-{defexpr,profile}
+              ''}
+
+              pushd ${user.home} >/dev/null
+              ${applyDirConfig user home}
+              ${concatStringsSep "\n" (mapAttrsToList (name: dir: ''
+                mkdir -p ${name}
+                pushd ${name} >/dev/null
+                ${applyDirConfig user dir}
+                popd >/dev/null
+              '') home.dirs)}
+              popd >/dev/null
+            ''
+        ) config.home);
+      };
+    };
+  }
diff --git a/modules/locale/default.nix b/modules/locale/default.nix
new file mode 100644
index 000000000000..eb92aeda76bd
--- /dev/null
+++ b/modules/locale/default.nix
@@ -0,0 +1,8 @@
+{ ... }:
+
+{
+  time.timeZone = "UTC";
+
+  i18n.defaultLocale = "eo.utf8";
+  environment.sessionVariables.LC_CTYPE = "en_GB.utf8";
+}
diff --git a/modules/nix/default.nix b/modules/nix/default.nix
new file mode 100644
index 000000000000..9f5af88ff117
--- /dev/null
+++ b/modules/nix/default.nix
@@ -0,0 +1,31 @@
+{ config, pkgs, options, lib, ... }:
+
+let
+  # Most of the standard Darwin-detection methods cause infinite recursion.
+  isDarwin = options.environment ? "darwinConfig";
+
+in {
+  nix.nixPath = [
+    "nixos-config=/run/current-system/nixlib/sys/${config.networking.hostName}.nix"
+    "/run/current-system/nixlib"
+  ];
+
+  system.extraSystemBuilderCmds = ''
+    ln -s ${lib.cleanSource ../..} $out/nixlib
+  '';
+
+  nixpkgs.overlays =
+    let
+      inherit (builtins) attrNames readDir;
+      dir = ../../nixpkgs-overlays;
+      names = attrNames (readDir dir);
+    in
+      map (o: import "${dir}/${o}") names;
+
+  services = lib.optionalAttrs isDarwin
+    { nix-daemon.enable = true; };
+
+  nix.package = pkgs.nixUnstable;
+
+  nix.daemonNiceLevel = 2;
+}
diff --git a/modules/nixos-hardware/.gitignore b/modules/nixos-hardware/.gitignore
new file mode 100644
index 000000000000..2151b35ff51e
--- /dev/null
+++ b/modules/nixos-hardware/.gitignore
@@ -0,0 +1,9 @@
+*~
+,*
+.*.swp
+.*.swo
+result
+result-*
+.version-suffix
+
+.DS_Store
diff --git a/modules/nixos-hardware/.travis.yml b/modules/nixos-hardware/.travis.yml
new file mode 100644
index 000000000000..689c9b6547cb
--- /dev/null
+++ b/modules/nixos-hardware/.travis.yml
@@ -0,0 +1,2 @@
+language: nix
+script: nix-build --dry-run --show-trace
diff --git a/modules/nixos-hardware/CODEOWNERS b/modules/nixos-hardware/CODEOWNERS
new file mode 100644
index 000000000000..563d5163ce17
--- /dev/null
+++ b/modules/nixos-hardware/CODEOWNERS
@@ -0,0 +1,6 @@
+beagleboard/pocketbeagle @yegortimoshenko
+dell/xps/13-9370 @moredread
+lenovo/thinkpad/x230 @makefu @yegortimoshenko
+lenovo/thinkpad/x250 @Mic92
+pcengines/apu @yegortimoshenko
+purism/librem/13v3 @yegortimoshenko
diff --git a/modules/nixos-hardware/CONTRIBUTING.md b/modules/nixos-hardware/CONTRIBUTING.md
new file mode 100644
index 000000000000..ea468923ae10
--- /dev/null
+++ b/modules/nixos-hardware/CONTRIBUTING.md
@@ -0,0 +1,31 @@
+# Writing profiles
+
+When setting an option, use `lib.mkDefault` unless:
+- The option *must* be set and the user should get an error if they try to override it.
+- The setting should merge with the user's settings (typical for list or set options).
+
+For example:
+
+```nix
+{ lib }: {
+  # Using mkDefault, because the user might want to disable tlp
+  services.tlp.enable = lib.mkDefault true;
+  # No need to use mkDefault, because the setting will merge with the user's setting
+  boot.kernelModules = [ "tmp_smapi" ];
+}
+```
+
+Try to avoid "opinionated" settings relating to optional features like sound, bluetooth, choice of bootloader etc.
+
+Where possible, use module imports to share code between similar hardware variants.
+
+# Performance
+
+Profiles should favor usability and stability, so performance improvements should either be conservative or 
+be guarded behind additional NixOS module options.
+
+If it makes sense to have a performance-focussed config, it can be declared in a separate profile.
+
+# Testing
+
+Because profiles can only be tested with the appropriate hardware, quality assurance is up to *you*.
diff --git a/modules/nixos-hardware/COPYING b/modules/nixos-hardware/COPYING
new file mode 100644
index 000000000000..47c6e27d1700
--- /dev/null
+++ b/modules/nixos-hardware/COPYING
@@ -0,0 +1,111 @@
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator and
+subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for the
+purpose of contributing to a commons of creative, cultural and scientific
+works ("Commons") that the public can reliably and without fear of later
+claims of infringement build upon, modify, incorporate in other works, reuse
+and redistribute as freely as possible in any form whatsoever and for any
+purposes, including without limitation commercial purposes. These owners may
+contribute to the Commons to promote the ideal of a free culture and the
+further production of creative, cultural and scientific works, or to gain
+reputation or greater distribution for their Work in part through the use and
+efforts of others.
+
+For these and/or other purposes and motivations, and without any expectation
+of additional consideration or compensation, the person associating CC0 with a
+Work (the "Affirmer"), to the extent that he or she is an owner of Copyright
+and Related Rights in the Work, voluntarily elects to apply CC0 to the Work
+and publicly distribute the Work under its terms, with knowledge of his or her
+Copyright and Related Rights in the Work and the meaning and intended legal
+effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not limited
+to, the following:
+
+  i. the right to reproduce, adapt, distribute, perform, display, communicate,
+  and translate a Work;
+
+  ii. moral rights retained by the original author(s) and/or performer(s);
+
+  iii. publicity and privacy rights pertaining to a person's image or likeness
+  depicted in a Work;
+
+  iv. rights protecting against unfair competition in regards to a Work,
+  subject to the limitations in paragraph 4(a), below;
+
+  v. rights protecting the extraction, dissemination, use and reuse of data in
+  a Work;
+
+  vi. database rights (such as those arising under Directive 96/9/EC of the
+  European Parliament and of the Council of 11 March 1996 on the legal
+  protection of databases, and under any national implementation thereof,
+  including any amended or successor version of such directive); and
+
+  vii. other similar, equivalent or corresponding rights throughout the world
+  based on applicable law or treaty, and any national implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention of,
+applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and
+unconditionally waives, abandons, and surrenders all of Affirmer's Copyright
+and Related Rights and associated claims and causes of action, whether now
+known or unknown (including existing as well as future claims and causes of
+action), in the Work (i) in all territories worldwide, (ii) for the maximum
+duration provided by applicable law or treaty (including future time
+extensions), (iii) in any current or future medium and for any number of
+copies, and (iv) for any purpose whatsoever, including without limitation
+commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes
+the Waiver for the benefit of each member of the public at large and to the
+detriment of Affirmer's heirs and successors, fully intending that such Waiver
+shall not be subject to revocation, rescission, cancellation, termination, or
+any other legal or equitable action to disrupt the quiet enjoyment of the Work
+by the public as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason be
+judged legally invalid or ineffective under applicable law, then the Waiver
+shall be preserved to the maximum extent permitted taking into account
+Affirmer's express Statement of Purpose. In addition, to the extent the Waiver
+is so judged Affirmer hereby grants to each affected person a royalty-free,
+non transferable, non sublicensable, non exclusive, irrevocable and
+unconditional license to exercise Affirmer's Copyright and Related Rights in
+the Work (i) in all territories worldwide, (ii) for the maximum duration
+provided by applicable law or treaty (including future time extensions), (iii)
+in any current or future medium and for any number of copies, and (iv) for any
+purpose whatsoever, including without limitation commercial, advertising or
+promotional purposes (the "License"). The License shall be deemed effective as
+of the date CC0 was applied by Affirmer to the Work. Should any part of the
+License for any reason be judged legally invalid or ineffective under
+applicable law, such partial invalidity or ineffectiveness shall not
+invalidate the remainder of the License, and in such case Affirmer hereby
+affirms that he or she will not (i) exercise any of his or her remaining
+Copyright and Related Rights in the Work or (ii) assert any associated claims
+and causes of action with respect to the Work, in either case contrary to
+Affirmer's express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+  a. No trademark or patent rights held by Affirmer are waived, abandoned,
+  surrendered, licensed or otherwise affected by this document.
+
+  b. Affirmer offers the Work as-is and makes no representations or warranties
+  of any kind concerning the Work, express, implied, statutory or otherwise,
+  including without limitation warranties of title, merchantability, fitness
+  for a particular purpose, non infringement, or the absence of latent or
+  other defects, accuracy, or the present or absence of errors, whether or not
+  discoverable, all to the greatest extent permissible under applicable law.
+
+  c. Affirmer disclaims responsibility for clearing rights of other persons
+  that may apply to the Work or any use thereof, including without limitation
+  any person's Copyright and Related Rights in the Work. Further, Affirmer
+  disclaims responsibility for obtaining any necessary consents, permissions
+  or other rights required for any use of the Work.
+
+  d. Affirmer understands and acknowledges that Creative Commons is not a
+  party to this document and has no duty or obligation with respect to this
+  CC0 or use of the Work.
diff --git a/modules/nixos-hardware/README.md b/modules/nixos-hardware/README.md
new file mode 100644
index 000000000000..f20bc64487e2
--- /dev/null
+++ b/modules/nixos-hardware/README.md
@@ -0,0 +1,70 @@
+NixOS profiles covering hardware quirks.
+
+## Setup
+
+Add and update `nixos-hardware` channel:
+
+```
+$ sudo nix-channel --add https://github.com/NixOS/nixos-hardware/archive/master.tar.gz nixos-hardware
+$ sudo nix-channel --update nixos-hardware
+```
+
+Then import an appropriate profile path from the table below. For example, to
+enable ThinkPad X220 profile, your `imports` in `/etc/nixos/configuration.nix`
+should look like:
+
+```
+imports = [
+  <nixos-hardware/lenovo/thinkpad/x220>
+  ./hardware-configuration.nix
+];
+```
+
+## Profiles
+
+| Model                             | Path                                         |
+| --------------------------------- | -------------------------------------------- |
+| [Acer Aspire 4810T][]             | `<nixos-hardware/acer/aspire/4810t>`         |
+| Airis N990                        | `<nixos-hardware/airis/n990>`                |
+| Apple MacBook Air 4,X             | `<nixos-hardware/apple/macbook-air/4>`       |
+| Apple MacBook Air 6,X             | `<nixos-hardware/apple/macbook-air/6>`       |
+| [Apple MacBook Pro 10,1][]        | `<nixos-hardware/apple/macbook-pro/10-1>`    |
+| Apple MacBook Pro 12,1            | `<nixos-hardware/apple/macbook-pro/12-1>`    |
+| BeagleBoard PocketBeagle          | `<nixos-hardware/beagleboard/pocketbeagle>`  |
+| [Dell XPS 13 9370][]              | `<nixos-hardware/dell/xps/13-9370>`          |
+| [Dell XPS 15 9550][]              | `<nixos-hardware/dell/xps/15-9550>`          |
+| [Inverse Path USB armory][]       | `<nixos-hardware/inversepath/usbarmory>`     |
+| Lenovo IdeaPad Z510               | `<nixos-hardware/lenovo/ideapad/z510>`       |
+| Lenovo ThinkPad T410              | `<nixos-hardware/lenovo/thinkpad/t410>`      |
+| Lenovo ThinkPad T430              | `<nixos-hardware/lenovo/thinkpad/t430>`      |
+| Lenovo ThinkPad T440p             | `<nixos-hardware/lenovo/thinkpad/t440p>`     |
+| Lenovo ThinkPad T450s             | `<nixos-hardware/lenovo/thinkpad/t450s>`     |
+| Lenovo ThinkPad T460s             | `<nixos-hardware/lenovo/thinkpad/t460s>`     |
+| Lenovo ThinkPad X140e             | `<nixos-hardware/lenovo/thinkpad/x140e>`     |
+| Lenovo ThinkPad X220              | `<nixos-hardware/lenovo/thinkpad/x220>`      |
+| Lenovo ThinkPad X230              | `<nixos-hardware/lenovo/thinkpad/x230>`      |
+| Lenovo ThinkPad X250              | `<nixos-hardware/lenovo/thinkpad/x250>`      |
+| [Lenovo ThinkPad X260][]          | `<nixos-hardware/lenovo/thinkpad/x260>`      |
+| Lenovo ThinkPad X270              | `<nixos-hardware/lenovo/thinkpad/x270>`      |
+| [Lenovo ThinkPad X1 (6th Gen)][]  | `<nixos-hardware/lenovo/thinkpad/x1/6th-gen>`|
+| [Microsoft Surface Pro 3][]       | `<nixos-hardware/microsoft/surface-pro/3>`   |
+| PC Engines APU                    | `<nixos-hardware/pcengines/apu>`             |
+| [Raspberry Pi 2][]                | `<nixos-hardware/raspberry-pi/2>`            |
+| [Samsung Series 9 NP900X3C][]     | `<nixos-hardware/samsung/np900x3c>`          |
+| [Purism Librem 13v3][]            | `<nixos-hardware/purism/librem/13v3>`        |
+| Supermicro A1SRi-2758F            | `<nixos-hardware/supermicro/a1sri-2758f>`    |
+| Supermicro X10SLL-F               | `<nixos-hardware/supermicro/x10sll-f>`       |
+| [Toshiba Chromebook 2 `swanky`][] | `<nixos-hardware/toshiba/swanky>`            |
+
+[Acer Aspire 4810T]: acer/aspire/4810t
+[Apple MacBook Pro 10,1]: apple/macbook-pro/10-1
+[Dell XPS 13 9370]: dell/xps/13-9370
+[Dell XPS 15 9550]: dell/xps/15-9550
+[Inverse Path USB armory]: inversepath/usbarmory
+[Lenovo ThinkPad X1 (6th Gen)]: lenovo/thinkpad/x1/6th-gen
+[Lenovo ThinkPad X260]: lenovo/thinkpad/x260
+[Microsoft Surface Pro 3]: microsoft/surface-pro/3
+[Raspberry Pi 2]: raspberry-pi/2
+[Samsung Series 9 NP900X3C]: samsung/np900x3c
+[Purism Librem 13v3]: purism/librem/13v3
+[Toshiba Chromebook 2 `swanky`]: toshiba/swanky
diff --git a/modules/nixos-hardware/acer/aspire/4810t/README.wiki b/modules/nixos-hardware/acer/aspire/4810t/README.wiki
new file mode 100644
index 000000000000..0b045b6e4da8
--- /dev/null
+++ b/modules/nixos-hardware/acer/aspire/4810t/README.wiki
@@ -0,0 +1,110 @@
+= Overview =
+* CPU: Intel Core 2 Solo U3500 @ 1.40GHz (speeds: 0.8, 1.2 and 1.4GHz), 3MB L2
+* Screen: 1366x768 LED
+
+= BIOS versions =
+* 1.10 - average ACPI temperature around 34°C, good GL playing
+* 1.20 - average ACPI temperature around 39°C, good GL playing
+* 1.31 - big slowdown in X windows from time to time, GL games with annoying slowdowns regularly
+
+The most recent BIOS updates (1.20 onwards) come with a DOS flasher; older come only with a windows flasher. I used a [http://www.pcengines.ch/freedos.htm freedos image] stored in a USB flash memory to boot freedos and flash the BIOS.
+
+= Drivers =
+All provided in linux 2.6.32 kernels.
+
+Linux 2.6.29 has problems at least with the wire ethernet card (Attansic Technology Corp. Device 1063). Loading and unloading the ethernet card driver module (atl1c) helps getting a working link, although it will change from eth0 to eth1, eth2, or another interface name.
+
+== lspci ==
+ 00:00.0 Host bridge: Intel Corporation Mobile 4 Series Chipset Memory Controller Hub (rev 07)
+ 00:02.0 VGA compatible controller: Intel Corporation Mobile 4 Series Chipset Integrated Graphics Controller (rev 07)
+ 00:02.1 Display controller: Intel Corporation Mobile 4 Series Chipset Integrated Graphics Controller (rev 07)
+ 00:1a.0 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #4 (rev 03)
+ 00:1a.1 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #5 (rev 03)
+ 00:1a.7 USB Controller: Intel Corporation 82801I (ICH9 Family) USB2 EHCI Controller #2 (rev 03)
+ 00:1b.0 Audio device: Intel Corporation 82801I (ICH9 Family) HD Audio Controller (rev 03)
+ 00:1c.0 PCI bridge: Intel Corporation 82801I (ICH9 Family) PCI Express Port 1 (rev 03)
+ 00:1c.1 PCI bridge: Intel Corporation 82801I (ICH9 Family) PCI Express Port 2 (rev 03)
+ 00:1d.0 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #1 (rev 03)
+ 00:1d.1 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #2 (rev 03)
+ 00:1d.2 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #3 (rev 03)
+ 00:1d.3 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #6 (rev 03)
+ 00:1d.7 USB Controller: Intel Corporation 82801I (ICH9 Family) USB2 EHCI Controller #1 (rev 03)
+ 00:1e.0 PCI bridge: Intel Corporation 82801 Mobile PCI Bridge (rev 93)
+ 00:1f.0 ISA bridge: Intel Corporation ICH9M-E LPC Interface Controller (rev 03)
+ 00:1f.2 IDE interface: Intel Corporation ICH9M/M-E 2 port SATA IDE Controller (rev 03)
+ 00:1f.3 SMBus: Intel Corporation 82801I (ICH9 Family) SMBus Controller (rev 03)
+ 00:1f.5 IDE interface: Intel Corporation ICH9M/M-E 2 port SATA IDE Controller (rev 03)
+ 00:1f.6 Signal processing controller: Intel Corporation 82801I (ICH9 Family) Thermal Subsystem (rev 03)
+ 01:00.0 Ethernet controller: Attansic Technology Corp. Device 1063 (rev c0)
+ 02:00.0 Network controller: Intel Corporation Wireless WiFi Link 5100
+
+= Configuration =
+
+ {
+  # Make te network WLAN card (wlan0) firmware available
+  require = [ ./nixos/modules/hardware/network/intel-5000.nix ];
+ 
+  boot = rec {
+    initrd = {
+      kernelModules = [ "ata_piix" "reiserfs" ];
+    };
+    kernelParams = [
+       "selinux=0"
+       "apm=on"
+       "acpi=on"
+       "vga=0x317"   
+       "console=tty1"
+       "video=vesafb:ywrap"
+       # Important, to disable Kernel Mode Setting for the graphics card
+       # This will allow backlight regulation
+       "nomodeset"
+    ];
+    kernelModules = [
+      "acpi-cpufreq"
+      "cpufreq-ondemand" # not autoloaded in 2.6.32.2
+      "kvm-intel"
+    ];
+    resumeDevice = "8:2";
+    extraKernelParams = ["resume=/dev/sda2"];
+    kernelPackages = pkgs.kernelPackages_2_6_32;
+    postBootCommands = ''
+      echo ondemand > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
+    '';
+  };
+ 
+  services = {
+    xserver = {
+      enable = true;
+      defaultDepth = 24;
+      videoDriver = "intel";
+      exportConfiguration = true;
+      enableTCP = true;
+      autorun = true;
+      driSupport = false;
+      synaptics = {
+        enable = true;
+        dev = "/dev/input/event8";
+      };
+   };
+ };
+
+= X settings =
+
+== Backlight ==
+Having disabled Kernel Mode Setting for the i915 kernel drm module (kernel parameter ''nomodeset''), use ''xrandr'' to set:
+ xrandr --output LVDS --set BACKLIGHT_CONTROL combination
+ xrandr --output LVDS --set BACKLIGHT 300  # ~1000, max light.
+
+If those steps make your mouse cursor not appear, switch to another VT, and then back to X, and it will come.
+
+== Synaptics pad ==
+I like the pad speed set by:
+ synclient MaxTapTime=0 MaxSpeed=1.12 MinSpeed=0.6 AccelFactor=0.001 VertEdgeScroll=1
+Install the ''xf86-input-synaptics-1.2.0'' for ''synclient'' to be in your PATH.
+
+= Suspending and hibernating =
+Usual pm-utils work, with pm-suspend and pm-hibernate.
+
+[[Category:Installation]]
+[[Category:Hardware]]
+[[Category:Laptops]]
diff --git a/modules/nixos-hardware/acer/aspire/4810t/default.nix b/modules/nixos-hardware/acer/aspire/4810t/default.nix
new file mode 100644
index 000000000000..d40b454b3aa4
--- /dev/null
+++ b/modules/nixos-hardware/acer/aspire/4810t/default.nix
@@ -0,0 +1,29 @@
+{ lib, ... }:
+
+{
+  imports = [
+    ../../../common/cpu/intel
+    ../../../common/pc/laptop
+  ];
+
+  boot = {
+    initrd.kernelModules = [ "ata_piix" ];
+    kernelParams = [
+      "apm=on"
+      "acpi=on"
+      "vga=0x317"
+      "video=vesafb:ywrap"
+
+      # Important, disable KMS to fix backlight regulation:
+      "nomodeset"
+    ];
+  };
+
+  # TODO: reverse compat
+  hardware.opengl.driSupport = false;
+
+  # TODO: reverse compat
+  services.xserver = {
+    defaultDepth = lib.mkDefault 24;
+  };
+}
diff --git a/modules/nixos-hardware/airis/n990/default.nix b/modules/nixos-hardware/airis/n990/default.nix
new file mode 100644
index 000000000000..ae06813131a8
--- /dev/null
+++ b/modules/nixos-hardware/airis/n990/default.nix
@@ -0,0 +1,21 @@
+{ lib, pkgs, ... }:
+
+{
+  imports = [ ../../common/pc/laptop ];
+
+  boot = {
+    initrd.kernelModules = [ "pata_via" ];
+
+    kernelParams = [
+      "apm=on"
+      "acpi=on"
+      "vga=0x317"  # 1024x768
+      "console=tty1"
+      "video=vesafb:ywrap"  # Faster scroll
+     ];
+  };
+
+  hardware.firmware = with pkgs; [ intel2200BGFirmware ];
+
+  services.xserver.videoDrivers = [ "openchrome" ];
+}
diff --git a/modules/nixos-hardware/apple/default.nix b/modules/nixos-hardware/apple/default.nix
new file mode 100644
index 000000000000..a2ee26230aaa
--- /dev/null
+++ b/modules/nixos-hardware/apple/default.nix
@@ -0,0 +1,12 @@
+{ config, lib, ... }:
+
+{
+  boot.kernelParams = [
+    "hid_apple.iso_layout=0"
+  ];
+
+  hardware.facetimehd.enable = lib.mkDefault
+    (config.nixpkgs.config.allowUnfree or false);
+
+  services.mbpfan.enable = lib.mkDefault true;
+}
diff --git a/modules/nixos-hardware/apple/macbook-air/4/default.nix b/modules/nixos-hardware/apple/macbook-air/4/default.nix
new file mode 100644
index 000000000000..181a099799a1
--- /dev/null
+++ b/modules/nixos-hardware/apple/macbook-air/4/default.nix
@@ -0,0 +1,16 @@
+{ lib, ... }:
+
+{
+  imports = [
+    ../.
+    ../../../common/cpu/intel/sandy-bridge
+  ];
+
+  boot.kernelParams = [
+    "acpi_backlight=vendor"
+  ];
+
+  services.xserver.deviceSection = lib.mkDefault ''
+    Option "TearFree" "true"
+  '';
+}
diff --git a/modules/nixos-hardware/apple/macbook-air/6/default.nix b/modules/nixos-hardware/apple/macbook-air/6/default.nix
new file mode 100644
index 000000000000..555d70418b85
--- /dev/null
+++ b/modules/nixos-hardware/apple/macbook-air/6/default.nix
@@ -0,0 +1,18 @@
+{ config, lib, ... }:
+
+{
+  imports = [ ../. ];
+
+  boot = {
+    extraModulePackages = with config.boot.kernelPackages; [ mba6x_bl ];
+    kernelModules = [ "mba6x_bl" ];
+
+    # Divides power consumption by two.
+    kernelParams = [ "acpi_osi=" ];
+  };
+
+  services.xserver.deviceSection = lib.mkDefault ''
+    Option "Backlight" "mba6x_backlight"
+    Option "TearFree" "true"
+  '';
+}
diff --git a/modules/nixos-hardware/apple/macbook-air/default.nix b/modules/nixos-hardware/apple/macbook-air/default.nix
new file mode 100644
index 000000000000..ea15175d0319
--- /dev/null
+++ b/modules/nixos-hardware/apple/macbook-air/default.nix
@@ -0,0 +1,8 @@
+{
+  imports = [
+    ../.
+    ../../common/cpu/intel
+    ../../common/pc/laptop
+    ../../common/pc/laptop/ssd
+  ];
+}
diff --git a/modules/nixos-hardware/apple/macbook-pro/10-1/README.wiki b/modules/nixos-hardware/apple/macbook-pro/10-1/README.wiki
new file mode 100644
index 000000000000..149b30e6ed22
--- /dev/null
+++ b/modules/nixos-hardware/apple/macbook-pro/10-1/README.wiki
@@ -0,0 +1,9 @@
+= Apple MacBook Pro 10,1 =
+
+I presume the associated configuration also will work with to other 10,x models.
+
+If you don't have an Ethernet adapter, make sure your NixOS installer has a sufficiently modern kernel or you will be stuck without internet and unable to installer.
+
+Note that (with NixPkgs circa late October 2016) Linux 4.8.1 does not work: everything will boot through X, but then manually-run commands accessing peripherals (nmcli, lspci, etc) will hang inexplicably.
+
+Thankfully no tweaking of the BIOS or similar was needed. Do note that if your MacOS partition is encrypted, you will have an easier time shrinking it from within MacOS, but this is standard advice.
diff --git a/modules/nixos-hardware/apple/macbook-pro/10-1/default.nix b/modules/nixos-hardware/apple/macbook-pro/10-1/default.nix
new file mode 100644
index 000000000000..e029ef21ecac
--- /dev/null
+++ b/modules/nixos-hardware/apple/macbook-pro/10-1/default.nix
@@ -0,0 +1,21 @@
+{ lib, pkgs, ... }:
+
+{
+  imports = [
+    ../.
+    ../../../common/pc/laptop/ssd
+  ];
+
+  # TODO: boot loader
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  # TODO: reverse compat
+  hardware.opengl.driSupport32Bit = true;
+
+  services.xserver = {
+    # TODO: we should not enable unfree drivers
+    # when there is an alternative (i.e. nouveau)
+    videoDrivers = [ "nvidia" ];
+  };
+}
diff --git a/modules/nixos-hardware/apple/macbook-pro/11-5/README.md b/modules/nixos-hardware/apple/macbook-pro/11-5/README.md
new file mode 100644
index 000000000000..17e5ef1d36e0
--- /dev/null
+++ b/modules/nixos-hardware/apple/macbook-pro/11-5/README.md
@@ -0,0 +1,32 @@
+# Apple MacBook Pro 11,5
+
+This configuration will **not** work with MacBook Pro 11,2 or 11,3 models.
+
+## Notable features
+
+* Prevent intermittent USB 3.0 controller wakeup signal when the lid is closed. Without this fix your laptop may get very hot and drain the battery after waking up in your laptop bag.
+
+  You can see for yourself which devices are allowed to wake up your laptop using the command:
+
+  ```shell
+  cat /proc/acpi/wakeup
+  ```
+
+  This fix works for Linux kernel 3.13 and above.
+
+  Sources:
+
+  * [Fix unwanted laptop resume after lid is closed](https://medium.com/@laurynas.karvelis_95228/install-arch-linux-on-macbook-pro-11-2-retina-install-guide-for-year-2017-2034ceed4cb2#66ba)
+  * [Arch wiki: MacBookPro11,x Suspend](https://wiki.archlinux.org/index.php/MacBookPro11,x#Suspend)
+  * [simonvandel/dotfiles (nix config)](https://github.com/simonvandel/dotfiles/blob/f254a4a607257faee295ce798ed215273c342850/nixos/vandel-macair/configuration.nix#L45)
+
+## Graphics
+
+The [MacBookPro11,4 and MacBookPro11,5](https://support.apple.com/kb/SP719) models ship with a discrete ATI graphics card (whereas MacBookPro11,2 and MacBookPro11,3 ship with NVidia cards). This is alongside the usual integrated Intel GPU.
+
+You may wish to look into dynamic switching between integrated and discrete graphics, but this config doesn't attempt it.
+
+## Additional resources
+
+* Arch linux wiki: [MacBookPro11,x](https://wiki.archlinux.org/index.php/MacBookPro11,x)
+* Kernel patches: [MacBookPro11,x](https://bugzilla.kernel.org/buglist.cgi?quicksearch=macbookpro11)
diff --git a/modules/nixos-hardware/apple/macbook-pro/11-5/default.nix b/modules/nixos-hardware/apple/macbook-pro/11-5/default.nix
new file mode 100644
index 000000000000..a53b5d8adeb4
--- /dev/null
+++ b/modules/nixos-hardware/apple/macbook-pro/11-5/default.nix
@@ -0,0 +1,27 @@
+{ lib, config, pkgs, ... }:
+
+let
+
+  kernelPackages = config.boot.kernelPackages;
+
+in
+
+{
+  imports = [
+    ../.
+    ../../../common/pc/laptop/ssd
+    <nixpkgs/nixos/modules/hardware/network/broadcom-43xx.nix>
+  ];
+
+  # Apparently this is currently only supported by ati_unfree drivers, not ati
+  hardware.opengl.driSupport32Bit = false;
+
+  services.xserver.videoDrivers = [ "ati" ];
+
+  services.udev.extraRules =
+    # Disable XHC1 wakeup signal to avoid resume getting triggered some time
+    # after suspend. Reboot required for this to take effect.
+    lib.optionalString
+      (lib.versionAtLeast kernelPackages.kernel.version "3.13")
+      ''SUBSYSTEM=="pci", KERNEL=="0000:00:14.0", ATTR{power/wakeup}="disabled"'';
+}
diff --git a/modules/nixos-hardware/apple/macbook-pro/12-1/default.nix b/modules/nixos-hardware/apple/macbook-pro/12-1/default.nix
new file mode 100644
index 000000000000..02c6f328cf5a
--- /dev/null
+++ b/modules/nixos-hardware/apple/macbook-pro/12-1/default.nix
@@ -0,0 +1,14 @@
+{ lib, ... }:
+
+{
+  imports = [
+    ../.
+    ../../../common/pc/laptop/ssd
+    <nixpkgs/nixos/modules/hardware/network/broadcom-43xx.nix>
+  ];
+
+  # USB subsystem wakes up MBP right after suspend unless we disable it.
+  services.udev.extraRules = lib.mkDefault ''
+    SUBSYSTEM=="pci", KERNEL=="0000:00:14.0", ATTR{power/wakeup}="disabled"
+  '';
+}
diff --git a/modules/nixos-hardware/apple/macbook-pro/default.nix b/modules/nixos-hardware/apple/macbook-pro/default.nix
new file mode 100644
index 000000000000..4ced65a382e0
--- /dev/null
+++ b/modules/nixos-hardware/apple/macbook-pro/default.nix
@@ -0,0 +1,7 @@
+{
+  imports = [
+    ../.
+    ../../common/cpu/intel
+    ../../common/pc/laptop
+  ];
+}
diff --git a/modules/nixos-hardware/asus/wireless-ac1300.nix b/modules/nixos-hardware/asus/wireless-ac1300.nix
new file mode 100644
index 000000000000..6e9b815a0eb0
--- /dev/null
+++ b/modules/nixos-hardware/asus/wireless-ac1300.nix
@@ -0,0 +1,6 @@
+{ config, ... }:
+
+{
+  boot.extraModulePackages = with config.boot.kernelPackages; [ rtl8812au ];
+  boot.kernelModules = [ "8812au" ];
+}
diff --git a/modules/nixos-hardware/audio-gd/compass2.nix b/modules/nixos-hardware/audio-gd/compass2.nix
new file mode 100644
index 000000000000..5268c1dab8d1
--- /dev/null
+++ b/modules/nixos-hardware/audio-gd/compass2.nix
@@ -0,0 +1,7 @@
+{
+  boot = {
+    extraModprobeConfig = lib.mkDefault ''
+      options snd slots=snd_usb_audio,snd-hda-intel
+    '';
+  };
+}
diff --git a/modules/nixos-hardware/beagleboard/pocketbeagle/default.nix b/modules/nixos-hardware/beagleboard/pocketbeagle/default.nix
new file mode 100644
index 000000000000..bc426300f458
--- /dev/null
+++ b/modules/nixos-hardware/beagleboard/pocketbeagle/default.nix
@@ -0,0 +1,10 @@
+{ lib, ... }:
+
+{
+  boot.kernelParams = [ "console=ttyO0,115200n8" ];
+
+  boot.loader = {
+    generic-extlinux-compatible.enable = lib.mkDefault true;
+    grub.enable = lib.mkDefault false;
+  };
+}
diff --git a/modules/nixos-hardware/common/cpu/amd/default.nix b/modules/nixos-hardware/common/cpu/amd/default.nix
new file mode 100644
index 000000000000..d8c48a263081
--- /dev/null
+++ b/modules/nixos-hardware/common/cpu/amd/default.nix
@@ -0,0 +1,6 @@
+{ config, lib, ... }:
+
+{
+  hardware.cpu.amd.updateMicrocode =
+    lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/modules/nixos-hardware/common/cpu/intel/default.nix b/modules/nixos-hardware/common/cpu/intel/default.nix
new file mode 100644
index 000000000000..7f2223c72e40
--- /dev/null
+++ b/modules/nixos-hardware/common/cpu/intel/default.nix
@@ -0,0 +1,14 @@
+{ config, lib, pkgs, ... }:
+
+{
+  boot.initrd.kernelModules = [ "i915" ];
+
+  hardware.cpu.intel.updateMicrocode =
+    lib.mkDefault config.hardware.enableRedistributableFirmware;
+  
+  hardware.opengl.extraPackages = with pkgs; [
+    vaapiIntel
+    vaapiVdpau
+    libvdpau-va-gl
+  ];
+}
diff --git a/modules/nixos-hardware/common/cpu/intel/kaby-lake/default.nix b/modules/nixos-hardware/common/cpu/intel/kaby-lake/default.nix
new file mode 100644
index 000000000000..e6a2d1ce8e6e
--- /dev/null
+++ b/modules/nixos-hardware/common/cpu/intel/kaby-lake/default.nix
@@ -0,0 +1,8 @@
+{
+  imports = [ ../. ];
+
+  boot.kernelParams = [
+    "i915.enable_fbc=1"
+    "i915.enable_psr=2"
+  ];
+}
diff --git a/modules/nixos-hardware/common/cpu/intel/sandy-bridge/default.nix b/modules/nixos-hardware/common/cpu/intel/sandy-bridge/default.nix
new file mode 100644
index 000000000000..682815cee473
--- /dev/null
+++ b/modules/nixos-hardware/common/cpu/intel/sandy-bridge/default.nix
@@ -0,0 +1,9 @@
+{
+  imports = [ ../. ];
+
+  # Enables RC6, RC6p and RC6pp.
+  # Last two are only available on Sandy Bridge CPUs (circa 2011).
+  boot.kernelParams = [
+    "i915.enable_rc6=7"
+  ];
+}
diff --git a/modules/nixos-hardware/common/pc/default.nix b/modules/nixos-hardware/common/pc/default.nix
new file mode 100644
index 000000000000..0b498ff1d20e
--- /dev/null
+++ b/modules/nixos-hardware/common/pc/default.nix
@@ -0,0 +1,5 @@
+{ lib, ... }:
+
+{
+  services.xserver.libinput.enable = lib.mkDefault true;
+}
diff --git a/modules/nixos-hardware/common/pc/hdd/default.nix b/modules/nixos-hardware/common/pc/hdd/default.nix
new file mode 100644
index 000000000000..8cc5ada0deb9
--- /dev/null
+++ b/modules/nixos-hardware/common/pc/hdd/default.nix
@@ -0,0 +1,7 @@
+{ lib, ... }:
+
+{
+  boot.kernel.sysctl = {
+    "vm.swappiness" = lib.mkDefault 10;
+  };
+}
diff --git a/modules/nixos-hardware/common/pc/laptop/acpi_call.nix b/modules/nixos-hardware/common/pc/laptop/acpi_call.nix
new file mode 100644
index 000000000000..f8c17dcc4901
--- /dev/null
+++ b/modules/nixos-hardware/common/pc/laptop/acpi_call.nix
@@ -0,0 +1,10 @@
+# acpi_call makes tlp work for newer thinkpads
+
+{ config, ... }:
+
+{
+  boot = {
+    kernelModules = [ "acpi_call" ];
+    extraModulePackages = with config.boot.kernelPackages; [ acpi_call ];
+  };
+}
diff --git a/modules/nixos-hardware/common/pc/laptop/cpu-throttling-bug.nix b/modules/nixos-hardware/common/pc/laptop/cpu-throttling-bug.nix
new file mode 100644
index 000000000000..a44bb7225d0f
--- /dev/null
+++ b/modules/nixos-hardware/common/pc/laptop/cpu-throttling-bug.nix
@@ -0,0 +1,38 @@
+{ config, pkgs, ... }:
+{
+  # Temporary fix for cpu throttling issues visible in the kernel log
+  # (journalctl -k) by setting the same temperature limits used by
+  # Window$
+  # See https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6)#Power_management.2FThrottling_issues
+  systemd.services.cpu-throttling = {
+    enable = true;
+    description = "Sets the offset to 3 °C, so the new trip point is 97 °C";
+    documentation = [
+      "https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6)#Power_management.2FThrottling_issues"
+    ];
+    path = [ pkgs.msr-tools ];
+    script = "wrmsr -a 0x1a2 0x3000000";
+    serviceConfig = {
+      Type = "oneshot";
+    };
+    wantedBy = [
+      "timers.target"
+    ];
+  };
+
+  systemd.timers.cpu-throttling = {
+    enable = true;
+    description = "Set cpu heating limit to 97 °C";
+    documentation = [
+      "https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6)#Power_management.2FThrottling_issues"
+    ];
+    timerConfig = {
+      OnActiveSec = 60;
+      OnUnitActiveSec = 60;
+      Unit = "cpu-throttling.service";
+    };
+    wantedBy = [
+      "timers.target"
+    ];
+  };
+}
diff --git a/modules/nixos-hardware/common/pc/laptop/default.nix b/modules/nixos-hardware/common/pc/laptop/default.nix
new file mode 100644
index 000000000000..ebc4931dbc29
--- /dev/null
+++ b/modules/nixos-hardware/common/pc/laptop/default.nix
@@ -0,0 +1,13 @@
+{ config, lib, ... }:
+
+{
+  imports = [ ../. ];
+
+  # TODO: fix in NixOS/nixpkgs
+  # Disable governor set in hardware-configuration.nix,
+  # required when services.tlp.enable is true:
+  powerManagement.cpuFreqGovernor =
+    lib.mkIf config.services.tlp.enable (lib.mkForce null);
+
+  services.tlp.enable = lib.mkDefault true;
+}
diff --git a/modules/nixos-hardware/common/pc/laptop/hdd/default.nix b/modules/nixos-hardware/common/pc/laptop/hdd/default.nix
new file mode 100644
index 000000000000..63f29d458c29
--- /dev/null
+++ b/modules/nixos-hardware/common/pc/laptop/hdd/default.nix
@@ -0,0 +1,8 @@
+{ lib, ... }:
+
+{
+  imports = [ ../../hdd ];
+
+  # Hard disk protection if the laptop falls:
+  services.hdapsd.enable = lib.mkDefault true;
+}
diff --git a/modules/nixos-hardware/common/pc/laptop/ssd b/modules/nixos-hardware/common/pc/laptop/ssd
new file mode 120000
index 000000000000..e313834a4372
--- /dev/null
+++ b/modules/nixos-hardware/common/pc/laptop/ssd
@@ -0,0 +1 @@
+../ssd
\ No newline at end of file
diff --git a/modules/nixos-hardware/common/pc/ssd/default.nix b/modules/nixos-hardware/common/pc/ssd/default.nix
new file mode 100644
index 000000000000..af0b49568cd1
--- /dev/null
+++ b/modules/nixos-hardware/common/pc/ssd/default.nix
@@ -0,0 +1,7 @@
+{ lib, ... }:
+
+{
+  boot.kernel.sysctl = {
+    "vm.swappiness" = lib.mkDefault 1;
+  };
+}
diff --git a/modules/nixos-hardware/default.nix b/modules/nixos-hardware/default.nix
new file mode 100644
index 000000000000..097b8bc5f90a
--- /dev/null
+++ b/modules/nixos-hardware/default.nix
@@ -0,0 +1,52 @@
+{ ... }:
+
+let
+  shim = {
+    boot.loader.systemd-boot.enable = true;
+
+    fileSystems."/" = {
+      device = "/dev/disk/by-uuid/00000000-0000-0000-0000-000000000000";
+      fsType = "btrfs";
+    };
+
+    nixpkgs.config = {
+      allowBroken = true;
+      allowUnfree = true;
+    };
+  };
+
+  buildProfile = profile: (import <nixpkgs/nixos> {
+    configuration.imports = [ profile shim ];
+  }).system;
+in
+
+{
+  acer-aspire-4810t = buildProfile ./acer/aspire/4810t;
+
+  airis-n990 = buildProfile ./airis/n990;
+
+  apple-macbook-air-4 = buildProfile ./apple/macbook-air/4;
+  apple-macbook-air-6 = buildProfile ./apple/macbook-air/6;
+  apple-macbook-pro-10-1 = buildProfile ./apple/macbook-pro/10-1;
+  apple-macbook-pro-11-5 = buildProfile ./apple/macbook-pro/11-5;
+  apple-macbook-pro-12-1 = buildProfile ./apple/macbook-pro/12-1;
+
+  dell-xps-13-9370 = buildProfile ./dell/xps/13-9370;
+  dell-xps-15-9550 = buildProfile ./dell/xps/15-9550;
+
+  lenovo-thinkpad-t410 = buildProfile ./lenovo/thinkpad/t410;
+  lenovo-thinkpad-t440p = buildProfile ./lenovo/thinkpad/t440p;
+  lenovo-thinkpad-t450s = buildProfile ./lenovo/thinkpad/t450s;
+  lenovo-thinkpad-t460s = buildProfile ./lenovo/thinkpad/t460s;
+  lenovo-thinkpad-x140e = buildProfile ./lenovo/thinkpad/x140e;
+  lenovo-thinkpad-x220 = buildProfile ./lenovo/thinkpad/x220;
+  lenovo-thinkpad-x230 = buildProfile ./lenovo/thinkpad/x230;
+  lenovo-thinkpad-x250 = buildProfile ./lenovo/thinkpad/x250;
+  lenovo-thinkpad-x260 = buildProfile ./lenovo/thinkpad/x260;
+
+  microsoft-surface-pro-3 = buildProfile ./microsoft/surface-pro/3;
+
+  pcengines-apu = buildProfile ./pcengines/apu;
+
+  toshiba-swanky = buildProfile ./toshiba/swanky;
+}
diff --git a/modules/nixos-hardware/dell/xps/13-9360/default.nix b/modules/nixos-hardware/dell/xps/13-9360/default.nix
new file mode 100644
index 000000000000..e13e758d44c7
--- /dev/null
+++ b/modules/nixos-hardware/dell/xps/13-9360/default.nix
@@ -0,0 +1,26 @@
+{ lib, pkgs, ... }:
+
+{
+  imports = [
+    ../../../common/cpu/intel/kaby-lake
+    ../../../common/pc/laptop
+  ];
+
+  boot.blacklistedKernelModules = [ "psmouse" ]; # touchpad goes over i2c
+
+  # TODO: decide on boot loader policy
+  boot.loader = {
+    efi.canTouchEfiVariables = lib.mkDefault true;
+    systemd-boot.enable = lib.mkDefault true;
+  };
+  
+  hardware.firmware = lib.mkBefore [ pkgs.qca6174-firmware ];
+
+  # TODO: move to general HiDPI profile
+  i18n.consoleFont = lib.mkDefault "latarcyrheb-sun32"; # 4K screen, use bigger console font
+
+  # TODO: upstream to NixOS/nixpkgs
+  nixpkgs.overlays = [(final: previous: {
+    qca6174-firmware = final.callPackage ./qca6174-firmware.nix {};
+  })];
+}
diff --git a/modules/nixos-hardware/dell/xps/13-9360/qca6174-firmware.nix b/modules/nixos-hardware/dell/xps/13-9360/qca6174-firmware.nix
new file mode 100644
index 000000000000..c5da6c183280
--- /dev/null
+++ b/modules/nixos-hardware/dell/xps/13-9360/qca6174-firmware.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "${target}-firmware-${version}";
+  version = "${branch}-00042";
+
+  branch = "4.4.1.c1";
+  target = "QCA6174";
+
+  src = fetchurl {
+    url = "https://github.com/kvalo/ath10k-firmware/raw/952afa4949cb34193040cd4e7441e1aee50ac731/${target}/hw3.0/${branch}/firmware-6.bin_RM.${version}-QCARMSWP-1";
+    sha256 = "01vvz3qhqw5l3yilcqgk1spk4y9k4qy7na7a57cbl037r231szdh";
+  };
+
+  buildCommand = ''
+    install -D $src $out/lib/firmware/ath10k/${target}/hw3.0/firmware-6.bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Updated firmware for the qca6174 wireless chip";
+    homepage = "https://github.com/kvalo/ath10k-firmware/tree/master/QCA6174/hw3.0";
+    license = licenses.unfreeRedistributable;
+    maintainers = with maintainers; [ yorickvp ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/modules/nixos-hardware/dell/xps/13-9370/README.wiki b/modules/nixos-hardware/dell/xps/13-9370/README.wiki
new file mode 100644
index 000000000000..57b5e08d3850
--- /dev/null
+++ b/modules/nixos-hardware/dell/xps/13-9370/README.wiki
@@ -0,0 +1,16 @@
+= Dell XPS 13 9370 =
+
+== Battery drain when sleeping ==
+
+The laptop uses the S2 sleep mode by default instead of S3, which leads to
+draining a lot of battery during sleep.
+
+Though this is intentional by the manufacturer and might cause lockups when
+forced  I - @moredread - never had any issues with it.
+
+See https://wiki.archlinux.org/index.php/Dell_XPS_13_(9370)#Power_Management
+and https://bugzilla.kernel.org/show_bug.cgi?id=199689#c3 for reference
+
+== Additional resources ==
+
+* Arch linux wiki: [https://wiki.archlinux.org/index.php/Dell_XPS_13_(9370) Dell XPS 13 9370]
diff --git a/modules/nixos-hardware/dell/xps/13-9370/default.nix b/modules/nixos-hardware/dell/xps/13-9370/default.nix
new file mode 100644
index 000000000000..cd53acd02fc0
--- /dev/null
+++ b/modules/nixos-hardware/dell/xps/13-9370/default.nix
@@ -0,0 +1,16 @@
+{ lib, pkgs, ... }:
+
+{
+  imports = [
+    ../../../common/cpu/intel/kaby-lake
+    ../../../common/pc/laptop
+    ../../../common/pc/laptop/acpi_call.nix
+    ../../../common/pc/laptop/cpu-throttling-bug.nix
+  ];
+
+  # Force S3 sleep mode. See README.wiki for details.
+  boot.kernelParams = [ "mem_sleep_default=deep" ];
+
+  # touchpad goes over i2c
+  boot.blacklistedKernelModules = [ "psmouse" ];
+}
diff --git a/modules/nixos-hardware/dell/xps/15-9550/README.wiki b/modules/nixos-hardware/dell/xps/15-9550/README.wiki
new file mode 100644
index 000000000000..c0e9158a883e
--- /dev/null
+++ b/modules/nixos-hardware/dell/xps/15-9550/README.wiki
@@ -0,0 +1,52 @@
+= Dell XPS 15 9550 =
+
+Most of this I presume also applies to the XPS 13 1530, the 13" variant.
+
+== Tested Hardware ==
+
+* CPU: Intel(R) Core(TM) i7-6700HQ CPU @ 2.60GHz
+* RAM: 16 GB
+* HDD: 512 GiB SSD
+* Screen: 15" 4k (3840✕2160)
+* Graphics: NVIDIA Corporation GM107M, with Intel Graphics too.
+* Input: Touchscreen and trackpad.
+
+
+== Firmware Configuration ==
+
+Not much tweaking of NixOS itself was needed. But we currently cannot automate the firmware setup, so this must be done by hand.
+
+=== Before installation ===
+
+These settings are needed both for booting the final install, and installer itself. Therefore, they must be done first.
+
+* ''Disable Secure Boot (but keep UEFI Boot).'' Thakfully doing so is as easy as changing any other simple setting.
+
+* ''Disable Intel hardware RAID and use AHCI instead.'' Intel doesn't seem to provide a working linux driver for this.  (If you just have SSD it's pointless and just slows things down needlessly anyways.)
+
+
+=== After installation ===
+
+* ''Add systemd-boot to UEFI boot list.'' The (uneditable anyways) settings mapping drive UUIDs to HD* work fine.
+
+=== Optional ===
+
+* ''Disable C-States.'' This is a processor idling thing. It seems to cause random crashes (Blank screen, no normal panic debug dump). Unfortunately, without it, the computer cannot be suspended. On the other hand, it doesn't seem to affect acpi's estimation of battery life when the computer is running with minimal load, but I haven't tested battery life in practice. I list it as optional as there's a tradeoff, and the crashes are rare enough one can probably get through installation just fine.
+
+* ''Update BIOS.'' According to Reddit, this helps with battery life.
+
+* ''Update Intel's Thunderbolt firmware.'' Without this, the Thunderbolt port will only work as power source, and not transfer data.
+
+=== Troubleshooting ===
+
+==== rcu_sched freezing problems ====
+
+After a recent update my machine became unstable. X couldn't start and even running `lspci` would lock the machine. I'm not sure what the root cause was, but I found the fix here: https://wiki.archlinux.org/index.php/Dell_XPS_15_9560#Troubleshooting
+
+TL;DR I added this line:
+
+```
+boot.kernelParams = [ "acpi_rev_override=1" "pcie_aspm=off" "nouveau.modeset=0" ];
+```
+
+Some more detail about the problem can be found here: https://bbs.archlinux.org/viewtopic.php?id=223056
diff --git a/modules/nixos-hardware/dell/xps/15-9550/default.nix b/modules/nixos-hardware/dell/xps/15-9550/default.nix
new file mode 100644
index 000000000000..90cfc6e2936a
--- /dev/null
+++ b/modules/nixos-hardware/dell/xps/15-9550/default.nix
@@ -0,0 +1,15 @@
+{ lib, ... }:
+
+{
+  imports = [
+    ../../../common/cpu/intel
+    ../../../common/pc/laptop
+  ];
+
+  # TODO: boot loader
+  boot.loader.systemd-boot.enable = lib.mkDefault true;
+  boot.loader.efi.canTouchEfiVariables = lib.mkDefault true;
+
+  # To just use Intel integrated graphics with Intel's open source driver
+  # hardware.nvidiaOptimus.disable = true;
+}
diff --git a/modules/nixos-hardware/inversepath/usbarmory/README.txt b/modules/nixos-hardware/inversepath/usbarmory/README.txt
new file mode 100644
index 000000000000..31922a8d7519
--- /dev/null
+++ b/modules/nixos-hardware/inversepath/usbarmory/README.txt
@@ -0,0 +1,6 @@
+USB Armory network interface support
+
+- rename the Armory USB network interface
+- set Armory inteface ip to 10.0.0.2/24
+- enable NAT and forward Armory interface
+- add the name 'armory' to /etc/hosts
diff --git a/modules/nixos-hardware/inversepath/usbarmory/default.nix b/modules/nixos-hardware/inversepath/usbarmory/default.nix
new file mode 100644
index 000000000000..5c329f8286d3
--- /dev/null
+++ b/modules/nixos-hardware/inversepath/usbarmory/default.nix
@@ -0,0 +1,46 @@
+{ config, lib, pkgs, ... }:
+
+{
+  boot = {
+    extraModprobeConfig = lib.mkDefault ''
+      options g_ether use_eem=0 dev_addr=1a:55:89:a2:69:41 host_addr=1a:55:89:a2:69:42
+    '';
+
+    kernelModules = [ "ledtrig_heartbeat" "ci_hdrc_imx" "g_ether" ];
+    kernelPackages = lib.mkDefault pkgs.linuxPackages_usbarmory;
+    kernelParams =  [ "console=ttymxc0,115200" ];
+
+    loader.generic-extlinux-compatible.enable = lib.mkDefault true;
+  };
+
+  networking = {
+    defaultGateway = "172.16.0.1";
+    firewall.enable = lib.mkDefault false;
+    hostName = "usbarmory";
+
+    interfaces.usb0.ip4 = [
+      { address = "172.16.0.2"; prefixLength = 24; }
+    ];
+
+    nameservers = [ "8.8.8.8" ];
+  };
+
+  nix = {
+    binaryCaches = [ "http://nixos-arm.dezgeg.me/channel" ];
+    binaryCachePublicKeys = [ "nixos-arm.dezgeg.me-1:xBaUKS3n17BZPKeyxL4JfbTqECsT+ysbDJz29kLFRW0=%" ];
+  };
+
+  nixpkgs.overlays = [(final: previous: {
+    linuxPackages_usbarmory = final.recurseIntoAttrs
+      (final.linuxPackagesFor (import ./kernel.nix {
+        inherit (final) stdenv buildLinux fetchurl;
+      }));
+  })];
+
+  sound.enable = lib.mkDefault false;
+
+  services = {
+    openssh.enable = lib.mkDefault true;
+    openssh.permitRootLogin = lib.mkDefault "without-password";
+  };
+}
diff --git a/modules/nixos-hardware/inversepath/usbarmory/host.nix b/modules/nixos-hardware/inversepath/usbarmory/host.nix
new file mode 100644
index 000000000000..42cef490c6f8
--- /dev/null
+++ b/modules/nixos-hardware/inversepath/usbarmory/host.nix
@@ -0,0 +1,19 @@
+{ dev ? "armory0" }:
+
+{
+  services.udev.extraRules = ''
+    SUBSYSTEM=="net", ACTION=="add", ATTRS{idVendor}=="0525", ATTRS{idProduct}=="a4a2", NAME="${staticDevName}"
+  '';
+
+  networking = {
+    interfaces."${staticDevName}".ip4 = [{
+      address = "10.0.0.2";
+      prefixLength = 24;
+    }];
+    nat = {
+      enable = true;
+      internalInterfaces = [ dev ];
+    };
+    extraHosts = "10.0.0.1 armory";
+  };
+}
diff --git a/modules/nixos-hardware/inversepath/usbarmory/kernel.config b/modules/nixos-hardware/inversepath/usbarmory/kernel.config
new file mode 100644
index 000000000000..e2fa29737937
--- /dev/null
+++ b/modules/nixos-hardware/inversepath/usbarmory/kernel.config
@@ -0,0 +1,995 @@
+CONFIG_ARM=y
+CONFIG_ARM_HAS_SG_CHAIN=y
+CONFIG_MIGHT_HAVE_PCI=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_HAVE_PROC_CPU=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_ARM_PATCH_PHYS_VIRT=y
+CONFIG_GENERIC_BUG=y
+CONFIG_PGTABLE_LEVELS=2
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
+CONFIG_DMIID=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_CROSS_COMPILE=""
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_LZ4=y
+CONFIG_KERNEL_GZIP=y
+CONFIG_DEFAULT_HOSTNAME="usbarmory"
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_CROSS_MEMORY_ATTACH=y
+CONFIG_FHANDLE=y
+CONFIG_USELIB=y
+CONFIG_AUDIT=y
+CONFIG_HAVE_ARCH_AUDITSYSCALL=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_CHIP=y
+CONFIG_IRQ_DOMAIN=y
+CONFIG_HANDLE_DOMAIN_IRQ=y
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_SPARSE_IRQ=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ_COMMON=y
+CONFIG_NO_HZ_IDLE=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_TICK_CPU_ACCOUNTING=y
+CONFIG_PREEMPT_RCU=y
+CONFIG_SRCU=y
+CONFIG_RCU_STALL_COMMON=y
+CONFIG_BUILD_BIN2C=y
+CONFIG_IKCONFIG=m
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_GENERIC_SCHED_CLOCK=y
+CONFIG_CGROUPS=y
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+CONFIG_HAVE_UID16=y
+CONFIG_BPF=y
+CONFIG_EXPERT=y
+CONFIG_UID16=y
+CONFIG_MULTIUSER=y
+CONFIG_SYSFS_SYSCALL=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_ADVISE_SYSCALLS=y
+CONFIG_MEMBARRIER=y
+CONFIG_EMBEDDED=y
+CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_PERF_USE_VMALLOC=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_COMPAT_BRK=y
+CONFIG_SLUB=y
+CONFIG_HAVE_OPROFILE=y
+CONFIG_JUMP_LABEL=y
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_GENERIC_IDLE_POLL_SETUP=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP_FILTER=y
+CONFIG_HAVE_CC_STACKPROTECTOR=y
+CONFIG_CC_STACKPROTECTOR_NONE=y
+CONFIG_HAVE_CONTEXT_TRACKING=y
+CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
+CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
+CONFIG_CLONE_BACKWARDS=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_OLD_SIGACTION=y
+CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+CONFIG_BLOCK=y
+CONFIG_LBDAF=y
+CONFIG_BLK_CMDLINE_PARSER=y
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_EFI_PARTITION=y
+CONFIG_EFI_STUB=y
+CONFIG_CMDLINE_PARTITION=y
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_DEADLINE=m
+CONFIG_IOSCHED_CFQ=m
+CONFIG_DEFAULT_NOOP=y
+CONFIG_DEFAULT_IOSCHED="noop"
+CONFIG_ASN1=m
+CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
+CONFIG_FREEZER=y
+CONFIG_MMU=y
+CONFIG_ARCH_MULTIPLATFORM=y
+CONFIG_ARCH_MULTI_V7=y
+CONFIG_ARCH_MULTI_V6_V7=y
+CONFIG_ARCH_MXC=y
+CONFIG_MXC_TZIC=y
+CONFIG_HAVE_IMX_SRC=y
+CONFIG_SOC_IMX5=y
+CONFIG_SOC_IMX53=y
+CONFIG_CPU_V7=y
+CONFIG_CPU_32v6K=y
+CONFIG_CPU_32v7=y
+CONFIG_CPU_ABRT_EV7=y
+CONFIG_CPU_PABRT_V7=y
+CONFIG_CPU_CACHE_V7=y
+CONFIG_CPU_CACHE_VIPT=y
+CONFIG_CPU_COPY_V6=y
+CONFIG_CPU_TLB_V7=y
+CONFIG_CPU_HAS_ASID=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+CONFIG_ARM_THUMB=y
+CONFIG_ARM_VIRT_EXT=y
+CONFIG_KUSER_HELPERS=y
+CONFIG_OUTER_CACHE=y
+CONFIG_OUTER_CACHE_SYNC=y
+CONFIG_MIGHT_HAVE_CACHE_L2X0=y
+CONFIG_CACHE_L2X0=y
+CONFIG_ARM_L1_CACHE_SHIFT_6=y
+CONFIG_ARM_L1_CACHE_SHIFT=6
+CONFIG_ARM_DMA_MEM_BUFFERABLE=y
+CONFIG_ARM_HEAVY_MB=y
+CONFIG_MULTI_IRQ_HANDLER=y
+CONFIG_HAVE_SMP=y
+CONFIG_VMSPLIT_2G=y
+CONFIG_PAGE_OFFSET=0x80000000
+CONFIG_ARCH_NR_GPIO=0
+CONFIG_PREEMPT=y
+CONFIG_PREEMPT_COUNT=y
+CONFIG_HZ_FIXED=0
+CONFIG_HZ_100=y
+CONFIG_HZ=100
+CONFIG_SCHED_HRTICK=y
+CONFIG_AEABI=y
+CONFIG_HAVE_ARCH_PFN_VALID=y
+CONFIG_CPU_SW_DOMAIN_PAN=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_HAVE_MEMBLOCK=y
+CONFIG_NO_BOOTMEM=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_COMPACTION=y
+CONFIG_MIGRATION=y
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_NEED_PER_CPU_KM=y
+CONFIG_CLEANCACHE=y
+CONFIG_ZPOOL=m
+CONFIG_ZBUD=m
+CONFIG_ZSMALLOC=m
+CONFIG_FORCE_MAX_ZONEORDER=11
+CONFIG_ALIGNMENT_TRAP=y
+CONFIG_SECCOMP=y
+CONFIG_SWIOTLB=y
+CONFIG_IOMMU_HELPER=y
+CONFIG_USE_OF=y
+CONFIG_ATAGS=y
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="noinitrd console=ttymxc0,115200 root=/dev/mmcblk0p1 rw rootfstype=ext4 ip=off"
+CONFIG_CMDLINE_FROM_BOOTLOADER=y
+CONFIG_AUTO_ZRELADDR=y
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_GOV_COMMON=y
+CONFIG_CPU_FREQ_STAT=m
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+CONFIG_CPUFREQ_DT=y
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_VFP=y
+CONFIG_VFPv3=y
+CONFIG_NEON=y
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_SCRIPT=y
+CONFIG_COREDUMP=y
+CONFIG_HIBERNATE_CALLBACKS=y
+CONFIG_HIBERNATION=y
+CONFIG_PM_STD_PARTITION=""
+CONFIG_PM_SLEEP=y
+CONFIG_PM=y
+CONFIG_PM_OPP=y
+CONFIG_PM_CLK=y
+CONFIG_CPU_PM=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARM_CPU_SUSPEND=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_NET=y
+CONFIG_NET_INGRESS=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_ALGO=m
+CONFIG_XFRM_USER=m
+CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_MIGRATE=y
+CONFIG_XFRM_STATISTICS=y
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IP_TUNNEL=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
+CONFIG_NET_UDP_TUNNEL=m
+CONFIG_NET_FOU=m
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+CONFIG_INET_UDP_DIAG=m
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_BIC=m
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_TCP_CONG_WESTWOOD=m
+CONFIG_TCP_CONG_HTCP=m
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_VEGAS=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_DEFAULT_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=m
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_VTI=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_NETFILTER=y
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=m
+CONFIG_NETFILTER_INGRESS=y
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_LOG_COMMON=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_PROCFS=y
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_REDIRECT=m
+CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_NAT=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_NF_DUP_IPV4=m
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
+CONFIG_NF_REJECT_IPV4=m
+CONFIG_NF_NAT_IPV4=m
+CONFIG_NF_NAT_MASQUERADE_IPV4=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_NF_DUP_IPV6=m
+CONFIG_NF_REJECT_IPV6=m
+CONFIG_NF_LOG_IPV6=m
+CONFIG_NF_NAT_IPV6=m
+CONFIG_NF_NAT_MASQUERADE_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+CONFIG_L2TP=m
+CONFIG_STP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_HAVE_NET_DSA=y
+CONFIG_VLAN_8021Q=m
+CONFIG_LLC=m
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_CGROUP=m
+CONFIG_NET_CLS_BPF=m
+CONFIG_NET_SCH_FIFO=y
+CONFIG_CGROUP_NET_CLASSID=y
+CONFIG_NET_RX_BUSY_POLL=y
+CONFIG_BQL=y
+CONFIG_BPF_JIT=y
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_CFG80211=m
+CONFIG_CFG80211_DEFAULT_PS=y
+CONFIG_CFG80211_CRDA_SUPPORT=y
+CONFIG_CFG80211_WEXT=y
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_MINSTREL_HT=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
+CONFIG_HAVE_BPF_JIT=y
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH=""
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_FW_LOADER=m
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE=""
+CONFIG_SOC_BUS=y
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=m
+CONFIG_REGMAP_MMIO=m
+CONFIG_MTD=m
+CONFIG_MTD_OF_PARTS=m
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+CONFIG_MTD_M25P80=m
+CONFIG_MTD_BLOCK2MTD=m
+CONFIG_MTD_SPI_NOR=m
+CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
+CONFIG_DTC=y
+CONFIG_OF=y
+CONFIG_OF_FLATTREE=y
+CONFIG_OF_EARLY_FLATTREE=y
+CONFIG_OF_ADDRESS=y
+CONFIG_OF_IRQ=y
+CONFIG_OF_NET=y
+CONFIG_OF_MTD=y
+CONFIG_OF_RESERVED_MEM=y
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+CONFIG_SRAM=y
+CONFIG_EEPROM_93CX6=m
+CONFIG_SCSI_MOD=m
+CONFIG_SCSI=m
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_PROC_FS=y
+CONFIG_BLK_DEV_SD=m
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_MD=y
+CONFIG_BLK_DEV_DM_BUILTIN=y
+CONFIG_BLK_DEV_DM=y
+CONFIG_DM_BUFIO=y
+CONFIG_DM_CRYPT=y
+CONFIG_DM_VERITY=y
+CONFIG_NETDEVICES=y
+CONFIG_NET_CORE=y
+CONFIG_DUMMY=m
+CONFIG_VXLAN=m
+CONFIG_TUN=m
+CONFIG_VETH=m
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPPOE=m
+CONFIG_PPPOL2TP=m
+CONFIG_SLHC=m
+CONFIG_USB_NET_DRIVERS=m
+CONFIG_WLAN=y
+CONFIG_RTL8187=m
+CONFIG_RT2X00=m
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RT2800_LIB=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+CONFIG_RT2X00_DEBUG=y
+CONFIG_RTL_CARDS=m
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_USB=m
+CONFIG_RTLWIFI_DEBUG=y
+CONFIG_RTL8192C_COMMON=m
+CONFIG_RTL8XXXU=m
+CONFIG_INPUT=y
+CONFIG_INPUT_LEDS=m
+CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_EVDEV=m
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_FOCALTECH=y
+CONFIG_MOUSE_SERIAL=m
+CONFIG_MOUSE_SYNAPTICS_USB=m
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_PROPERTIES=y
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_USB_E2I=y
+CONFIG_SERIO=y
+CONFIG_SERIO_SERPORT=y
+CONFIG_SERIO_LIBPS2=y
+CONFIG_TTY=y
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_DEVMEM=y
+CONFIG_DEVKMEM=y
+CONFIG_SERIAL_EARLYCON=y
+CONFIG_SERIAL_IMX=y
+CONFIG_SERIAL_IMX_CONSOLE=y
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_HW_RANDOM=m
+CONFIG_I2C=m
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_IMX=m
+CONFIG_SPI=y
+CONFIG_SPI_DEBUG=y
+CONFIG_SPI_MASTER=y
+CONFIG_SPI_BITBANG=m
+CONFIG_SPI_IMX=m
+CONFIG_SPI_SPIDEV=m
+CONFIG_PPS=y
+CONFIG_PINCTRL=y
+CONFIG_PINMUX=y
+CONFIG_PINCONF=y
+CONFIG_PINCTRL_IMX=y
+CONFIG_PINCTRL_IMX53=y
+CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_ARCH_REQUIRE_GPIOLIB=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIO_DEVRES=y
+CONFIG_OF_GPIO=y
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_GENERIC=y
+CONFIG_GPIO_GENERIC_PLATFORM=y
+CONFIG_GPIO_MXC=y
+CONFIG_POWER_SUPPLY=y
+CONFIG_POWER_AVS=y
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_GPIO_WATCHDOG=m
+CONFIG_IMX2_WDT=m
+CONFIG_SSB_POSSIBLE=y
+CONFIG_BCMA_POSSIBLE=y
+CONFIG_REGULATOR=y
+CONFIG_REGULATOR_LTC3589=m
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_HID=y
+CONFIG_HID_GENERIC=m
+CONFIG_USB_HID=m
+CONFIG_USB_HIDDEV=y
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=m
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB=m
+CONFIG_USB_DEFAULT_PERSIST=y
+CONFIG_USB_OTG=y
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_STORAGE=m
+CONFIG_USB_CHIPIDEA=m
+CONFIG_USB_CHIPIDEA_OF=m
+CONFIG_USB_CHIPIDEA_UDC=y
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_CHIPIDEA_DEBUG=y
+CONFIG_USB_PHY=y
+CONFIG_NOP_USB_XCEIV=y
+CONFIG_USB_GADGET=m
+CONFIG_USB_GADGET_DEBUG_FS=y
+CONFIG_USB_GADGET_VBUS_DRAW=500
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+CONFIG_USB_LIBCOMPOSITE=m
+CONFIG_USB_F_ACM=m
+CONFIG_USB_F_SS_LB=m
+CONFIG_USB_U_SERIAL=m
+CONFIG_USB_U_ETHER=m
+CONFIG_USB_F_SERIAL=m
+CONFIG_USB_F_OBEX=m
+CONFIG_USB_F_NCM=m
+CONFIG_USB_F_ECM=m
+CONFIG_USB_F_EEM=m
+CONFIG_USB_F_SUBSET=m
+CONFIG_USB_F_RNDIS=m
+CONFIG_USB_F_MASS_STORAGE=m
+CONFIG_USB_F_FS=m
+CONFIG_USB_F_HID=m
+CONFIG_USB_F_PRINTER=m
+CONFIG_USB_CONFIGFS=m
+CONFIG_USB_CONFIGFS_SERIAL=y
+CONFIG_USB_CONFIGFS_ACM=y
+CONFIG_USB_CONFIGFS_OBEX=y
+CONFIG_USB_CONFIGFS_NCM=y
+CONFIG_USB_CONFIGFS_ECM=y
+CONFIG_USB_CONFIGFS_ECM_SUBSET=y
+CONFIG_USB_CONFIGFS_RNDIS=y
+CONFIG_USB_CONFIGFS_EEM=y
+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+CONFIG_USB_CONFIGFS_F_LB_SS=y
+CONFIG_USB_CONFIGFS_F_FS=y
+CONFIG_USB_CONFIGFS_F_HID=y
+CONFIG_USB_CONFIGFS_F_PRINTER=y
+CONFIG_USB_ZERO=m
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+CONFIG_USB_ETH_EEM=y
+CONFIG_USB_G_NCM=m
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FUNCTIONFS=m
+CONFIG_USB_FUNCTIONFS_ETH=y
+CONFIG_USB_FUNCTIONFS_RNDIS=y
+CONFIG_USB_FUNCTIONFS_GENERIC=y
+CONFIG_USB_MASS_STORAGE=m
+CONFIG_USB_G_SERIAL=m
+CONFIG_USB_G_PRINTER=m
+CONFIG_USB_CDC_COMPOSITE=m
+CONFIG_USB_G_ACM_MS=m
+CONFIG_USB_G_MULTI=m
+CONFIG_USB_G_MULTI_RNDIS=y
+CONFIG_USB_G_MULTI_CDC=y
+CONFIG_USB_G_HID=m
+CONFIG_MMC=y
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK_MINORS=8
+CONFIG_MMC_BLOCK_BOUNCE=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_IO_ACCESSORS=y
+CONFIG_MMC_SDHCI_PLTFM=y
+CONFIG_MMC_SDHCI_ESDHC_IMX=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=m
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_CPU=y
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_EDAC_ATOMIC_SCRUB=y
+CONFIG_EDAC_SUPPORT=y
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_SYSTOHC=y
+CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+CONFIG_RTC_DRV_IMXDI=y
+CONFIG_RTC_DRV_MXC=y
+CONFIG_DMADEVICES=y
+CONFIG_DMA_ENGINE=y
+CONFIG_DMA_OF=y
+CONFIG_IMX_SDMA=m
+CONFIG_CLKDEV_LOOKUP=y
+CONFIG_HAVE_CLK_PREPARE=y
+CONFIG_COMMON_CLK=y
+CONFIG_CLKSRC_OF=y
+CONFIG_CLKSRC_PROBE=y
+CONFIG_CLKSRC_MMIO=y
+CONFIG_CLKSRC_IMX_GPT=y
+CONFIG_IOMMU_SUPPORT=y
+CONFIG_EXTCON=m
+CONFIG_IRQCHIP=y
+CONFIG_ARCH_HAS_RESET_CONTROLLER=y
+CONFIG_DCACHE_WORD_ACCESS=y
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_USE_FOR_EXT2=y
+CONFIG_JBD2=y
+CONFIG_FS_MBCACHE=y
+CONFIG_EXPORTFS=y
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_AUTOFS4_FS=y
+CONFIG_FUSE_FS=m
+CONFIG_OVERLAY_FS=y
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=m
+CONFIG_NTFS_RW=y
+CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_KERNFS=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
+CONFIG_CONFIGFS_FS=y
+CONFIG_MISC_FILESYSTEMS=y
+CONFIG_ECRYPT_FS=m
+CONFIG_ECRYPT_FS_MESSAGING=y
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_RTIME=y
+CONFIG_SQUASHFS=y
+CONFIG_SQUASHFS_FILE_DIRECT=y
+CONFIG_SQUASHFS_DECOMP_SINGLE=y
+CONFIG_SQUASHFS_ZLIB=y
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
+CONFIG_NFSD=m
+CONFIG_NFSD_V3=y
+CONFIG_GRACE_PERIOD=m
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+CONFIG_CIFS=m
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_ASCII=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_UTF8=y
+CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
+CONFIG_DEBUG_FS=y
+CONFIG_SECTION_MISMATCH_WARN_ONLY=y
+CONFIG_DEBUG_KERNEL=y
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=1
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=0
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=1
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_PANIC_TIMEOUT=5
+CONFIG_SCHED_DEBUG=y
+CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_RCU_CPU_STALL_TIMEOUT=21
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_LKDTM=m
+CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_STRICT_DEVMEM=y
+CONFIG_ARM_UNWIND=y
+CONFIG_DEBUG_IMX_UART_PORT=1
+CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
+CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
+CONFIG_KEYS=y
+CONFIG_ENCRYPTED_KEYS=m
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_INTEGRITY=y
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_RNG_DEFAULT=m
+CONFIG_CRYPTO_PCOMP=m
+CONFIG_CRYPTO_PCOMP2=y
+CONFIG_CRYPTO_AKCIPHER2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_NULL2=y
+CONFIG_CRYPTO_WORKQUEUE=y
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_SEQIV=m
+CONFIG_CRYPTO_ECHAINIV=m
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_HMAC=m
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_ZLIB=m
+CONFIG_CRYPTO_LZO=m
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_DRBG_MENU=m
+CONFIG_CRYPTO_DRBG_HMAC=y
+CONFIG_CRYPTO_DRBG_HASH=y
+CONFIG_CRYPTO_DRBG_CTR=y
+CONFIG_CRYPTO_DRBG=m
+CONFIG_CRYPTO_JITTERENTROPY=m
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_HASH_INFO=y
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_SAHARA=y
+CONFIG_ASYMMETRIC_KEY_TYPE=m
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
+CONFIG_PUBLIC_KEY_ALGO_RSA=m
+CONFIG_X509_CERTIFICATE_PARSER=m
+CONFIG_PKCS7_MESSAGE_PARSER=m
+CONFIG_BITREVERSE=y
+CONFIG_HAVE_ARCH_BITREVERSE=y
+CONFIG_RATIONAL=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_IO=y
+CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=y
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+CONFIG_CRC32_SLICEBY8=y
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_DECOMPRESS=y
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_ASSOCIATIVE_ARRAY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT_MAP=y
+CONFIG_HAS_DMA=y
+CONFIG_DQL=y
+CONFIG_NLATTR=y
+CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
+CONFIG_CLZ_TAB=y
+CONFIG_MPILIB=m
+CONFIG_LIBFDT=y
+CONFIG_OID_REGISTRY=m
+CONFIG_ARCH_HAS_SG_CHAIN=y
diff --git a/modules/nixos-hardware/inversepath/usbarmory/kernel.nix b/modules/nixos-hardware/inversepath/usbarmory/kernel.nix
new file mode 100644
index 000000000000..4cf6fd7fdb8a
--- /dev/null
+++ b/modules/nixos-hardware/inversepath/usbarmory/kernel.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildLinux, fetchurl }:
+
+buildLinux {
+  inherit stdenv;
+  version = "4.4.0";
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz";
+    sha256 = "401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2";
+  };
+
+  configfile = ./kernel.config;
+
+  kernelPatches = [{
+    patch = ./usbarmory-dts.patch;
+    name = "usbarmory-dts";
+  }];
+
+  allowImportFromDerivation = true;
+}
diff --git a/modules/nixos-hardware/inversepath/usbarmory/usbarmory-dts.patch b/modules/nixos-hardware/inversepath/usbarmory/usbarmory-dts.patch
new file mode 100644
index 000000000000..e29c6dd331db
--- /dev/null
+++ b/modules/nixos-hardware/inversepath/usbarmory/usbarmory-dts.patch
@@ -0,0 +1,418 @@
+diff -Nru linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-common.dtsi linux-4.4/arch/arm/boot/dts/imx53-usbarmory-common.dtsi
+--- linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-common.dtsi	1969-12-31 18:00:00.000000000 -0600
++++ linux-4.4/arch/arm/boot/dts/imx53-usbarmory-common.dtsi	2016-02-04 08:31:38.730794858 -0600
+@@ -0,0 +1,241 @@
++/*
++ * USB armory MkI device tree include file
++ * https://inversepath.com/usbarmory
++ *
++ * Copyright (C) 2015, Inverse Path
++ * Andrej Rosano <andrej@inversepath.com>
++ *
++ * Licensed under GPLv2
++ */
++
++#include "imx53.dtsi"
++
++/ {
++	model = "Inverse Path USB armory";
++	compatible = "inversepath,imx53-usbarmory", "fsl,imx53";
++};
++
++/ {
++	chosen {
++		stdout-path = &uart1;
++	};
++
++	memory {
++		reg = <0x70000000 0x20000000>;
++	};
++
++	leds {
++		compatible = "gpio-leds";
++		pinctrl-names = "default";
++		pinctrl-0 = <&led_pin_gpio4_27>;
++
++		user {
++			label = "LED";
++			gpios = <&gpio4 27 0>;
++			linux,default-trigger = "heartbeat";
++		};
++	};
++
++	soc {
++		aips@60000000 {
++			sahara: crypto@63ff8000 {
++				compatible = "fsl,imx53-sahara";
++				reg = <0x63ff8000 0x4000>;
++				interrupts = <19 20>;
++				clocks = <&clks IMX5_CLK_SAHARA_IPG_GATE>,
++					 <&clks IMX5_CLK_SAHARA_IPG_GATE>;
++				clock-names = "ipg", "ahb";
++			};
++		};
++	};
++};
++
++&cpu0 {
++	device_type = "cpu";
++	compatible = "arm,cortex-a8";
++	reg = <0x0>;
++	clocks = <&clks IMX5_CLK_ARM>;
++	clock-latency = <61036>;
++	voltage-tolerance = <5>;
++	operating-points = <
++		/* kHz */
++		 166666  850000
++		 400000  900000
++		 800000 1050000
++	>;
++};
++
++&esdhc1 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_esdhc1>;
++	status = "okay";
++};
++
++&iomuxc {
++	pinctrl-names = "default";
++
++	imx53-usbarmory {
++		led_pin_gpio4_27: led_gpio4_27@0 {
++			fsl,pins = <
++				MX53_PAD_DISP0_DAT6__GPIO4_27 0x80000000
++			>;
++		};
++
++		pinctrl_esdhc1: esdhc1grp {
++			fsl,pins = <
++				MX53_PAD_SD1_DATA0__ESDHC1_DAT0		0x1d5
++				MX53_PAD_SD1_DATA1__ESDHC1_DAT1		0x1d5
++				MX53_PAD_SD1_DATA2__ESDHC1_DAT2		0x1d5
++				MX53_PAD_SD1_DATA3__ESDHC1_DAT3		0x1d5
++				MX53_PAD_SD1_CMD__ESDHC1_CMD		0x1d5
++				MX53_PAD_SD1_CLK__ESDHC1_CLK		0x1d5
++			>;
++		};
++
++		pinctrl_i2c1_pmic: i2c1grp_pmic {
++			fsl,pins = <
++				MX53_PAD_EIM_D21__I2C1_SCL	0xc0000000
++				MX53_PAD_EIM_D28__I2C1_SDA	0xc0000000
++			>;
++		};
++
++		/*
++		UART mode pin header configration:
++		pin number:	1     2     3     4     5      6      7
++		function:	GND   5V    ?     ?     TX     RX     ?
++		*/
++		pinctrl_uart1: uart1grp {
++			fsl,pins = <
++				MX53_PAD_CSI0_DAT10__UART1_TXD_MUX	0x1e4
++				MX53_PAD_CSI0_DAT11__UART1_RXD_MUX	0x1e4
++			>;
++		};
++
++		/*
++		GPIO mode pin header configuration:
++		1     2     3         4         5         6         7
++		GND   5V    GPIO5[26] GPIO5[27] GPIO5[28] GPIO5[29] GPIO5[30]
++		*/
++		pinctrl_gpio5: gpio5grp {
++			fsl,pins = <
++				MX53_PAD_CSI0_DAT8__GPIO5_26	0xc0
++				MX53_PAD_CSI0_DAT9__GPIO5_27	0xc0
++				MX53_PAD_CSI0_DAT10__GPIO5_28	0xc0
++				MX53_PAD_CSI0_DAT11__GPIO5_29	0xc0
++				MX53_PAD_CSI0_DAT12__GPIO5_30	0xc0
++			>;
++		};
++
++		/*
++		SPI mode pin header configuration:
++		1     2     3      4      5      6      7
++		GND   5V    SCLK   MOSI   MISO   /SS0   /SS1
++		*/
++		pinctrl_ecspi2: ecspi2grp {
++			fsl,pins = <
++				MX53_PAD_CSI0_DAT8__ECSPI2_SCLK		0x80000000
++				MX53_PAD_CSI0_DAT9__ECSPI2_MOSI		0x80000000
++				MX53_PAD_CSI0_DAT10__ECSPI2_MISO	0x80000000
++				MX53_PAD_CSI0_DAT11__GPIO5_29		0x80000000
++				MX53_PAD_CSI0_DAT12__GPIO5_30		0x80000000
++			>;
++		};
++
++		/*
++		I2C mode pin header configuration:
++		1     2    3     4     5          6          7
++		GND   5V   SDA   SCL   GPIO5[28]  GPIO5[29]  GPIO5[30]
++		*/
++		pinctrl_i2c1_pinheader: i2c1grp_pinheader {
++			fsl,pins = <
++				MX53_PAD_CSI0_DAT8__I2C1_SDA	0xc0000000
++				MX53_PAD_CSI0_DAT9__I2C1_SCL	0xc0000000
++				MX53_PAD_CSI0_DAT10__GPIO5_28	0x80000000
++				MX53_PAD_CSI0_DAT11__GPIO5_29	0x80000000
++				MX53_PAD_CSI0_DAT12__GPIO5_30	0x80000000
++			>;
++		};
++	};
++};
++
++&uart1 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_uart1>;
++	status = "okay";
++};
++
++&vpu {
++	status = "okay";
++};
++
++&i2c1 {
++	pinctrl-0 = <&pinctrl_i2c1_pmic>;
++	status = "okay";
++	ltc3589: pmic@34 {
++		compatible = "lltc,ltc3589-2";
++		reg = <0x34>;
++		regulators {
++			sw1_reg: sw1 {
++				regulator-min-microvolt = <591930>;
++				regulator-max-microvolt = <1224671>;
++				lltc,fb-voltage-divider = <100000 158000>;
++				regulator-ramp-delay = <7000>;
++				regulator-boot-on;
++				regulator-always-on;
++			};
++
++			sw2_reg: sw2 {
++				regulator-min-microvolt = <704123>;
++				regulator-max-microvolt = <1456803>;
++				lltc,fb-voltage-divider = <180000 191000>;
++				regulator-ramp-delay = <7000>;
++				regulator-boot-on;
++				regulator-always-on;
++			};
++
++			sw3_reg: sw3 {
++				regulator-min-microvolt = <1341250>;
++				regulator-max-microvolt = <2775000>;
++				lltc,fb-voltage-divider = <270000 100000>;
++				regulator-ramp-delay = <7000>;
++				regulator-boot-on;
++				regulator-always-on;
++			};
++
++			bb_out_reg: bb-out {
++				regulator-min-microvolt = <3387341>;
++				regulator-max-microvolt = <3387341>;
++				lltc,fb-voltage-divider = <511000 158000>;
++				regulator-boot-on;
++				regulator-always-on;
++			};
++			ldo1_reg: ldo1 {
++				regulator-min-microvolt = <1306329>;
++				regulator-max-microvolt = <1306329>;
++				lltc,fb-voltage-divider = <100000 158000>;
++				regulator-boot-on;
++				regulator-always-on;
++			};
++
++			ldo2_reg: ldo2 {
++				regulator-min-microvolt = <704123>;
++				regulator-max-microvolt = <1456806>;
++				lltc,fb-voltage-divider = <180000 191000>;
++				regulator-ramp-delay = <7000>;
++				regulator-boot-on;
++				regulator-always-on;
++			};
++
++			ldo3_reg: ldo3 {
++				regulator-min-microvolt = <2800000>;
++				regulator-max-microvolt = <2800000>;
++				regulator-boot-on;
++			};
++
++			ldo4_reg: ldo4 {
++				regulator-min-microvolt = <1200000>;
++				regulator-max-microvolt = <3200000>;
++			};
++		};
++	};
++};
+diff -Nru linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory.dts linux-4.4/arch/arm/boot/dts/imx53-usbarmory.dts
+--- linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory.dts	1969-12-31 18:00:00.000000000 -0600
++++ linux-4.4/arch/arm/boot/dts/imx53-usbarmory.dts	2016-02-04 08:31:38.730794858 -0600
+@@ -0,0 +1,18 @@
++/*
++ * USB armory MkI device mode device tree file
++ * https://inversepath.com/usbarmory
++ *
++ * Copyright (C) 2015, Inverse Path
++ * Andrej Rosano <andrej@inversepath.com>
++ *
++ * Licensed under GPLv2
++ */
++
++/dts-v1/;
++
++#include "imx53-usbarmory-common.dtsi"
++
++&usbotg {
++	dr_mode = "peripheral";
++	status = "okay";
++};
+diff -Nru linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-gpio.dts linux-4.4/arch/arm/boot/dts/imx53-usbarmory-gpio.dts
+--- linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-gpio.dts	1969-12-31 18:00:00.000000000 -0600
++++ linux-4.4/arch/arm/boot/dts/imx53-usbarmory-gpio.dts	2016-02-04 08:31:38.730794858 -0600
+@@ -0,0 +1,26 @@
++/*
++ * USB armory MkI device mode device tree file
++ * https://inversepath.com/usbarmory
++ *
++ * Copyright (C) 2015, Inverse Path
++ * Andrej Rosano <andrej@inversepath.com>
++ *
++ * Licensed under GPLv2
++ */
++
++/dts-v1/;
++
++#include "imx53-usbarmory-common.dtsi"
++
++&usbotg {
++	dr_mode = "peripheral";
++	status = "okay";
++};
++
++&iomuxc {
++	pinctrl-0 = <&pinctrl_gpio5>;
++};
++
++&uart1 {
++	status = "disabled";
++};
+diff -Nru linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-host.dts linux-4.4/arch/arm/boot/dts/imx53-usbarmory-host.dts
+--- linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-host.dts	1969-12-31 18:00:00.000000000 -0600
++++ linux-4.4/arch/arm/boot/dts/imx53-usbarmory-host.dts	2016-02-04 08:31:38.730794858 -0600
+@@ -0,0 +1,18 @@
++/*
++ * USB armory MkI host mode device tree file
++ * https://inversepath.com/usbarmory
++ *
++ * Copyright (C) 2015, Inverse Path
++ * Andrej Rosano <andrej@inversepath.com>
++ *
++ * Licensed under GPLv2
++ */
++
++/dts-v1/;
++
++#include "imx53-usbarmory-common.dtsi"
++
++&usbotg {
++	dr_mode = "host";
++	status = "okay";
++};
+diff -Nru linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-i2c.dts linux-4.4/arch/arm/boot/dts/imx53-usbarmory-i2c.dts
+--- linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-i2c.dts	1969-12-31 18:00:00.000000000 -0600
++++ linux-4.4/arch/arm/boot/dts/imx53-usbarmory-i2c.dts	2016-02-04 08:31:38.730794858 -0600
+@@ -0,0 +1,32 @@
++/*
++ * USB armory MkI device mode device tree file
++ * https://inversepath.com/usbarmory
++ *
++ * Copyright (C) 2015, Inverse Path
++ * Andrej Rosano <andrej@inversepath.com>
++ *
++ * Licensed under GPLv2
++ */
++
++/dts-v1/;
++
++#include "imx53-usbarmory-common.dtsi"
++
++&usbotg {
++	dr_mode = "peripheral";
++	status = "okay";
++};
++
++&uart1 {
++	status = "disabled";
++};
++
++&iomuxc {
++	pinctrl-0 = <&pinctrl_i2c1_pinheader>;
++};
++
++&i2c1 {
++	ltc3589: pmic@34 {
++		status = "disabled";
++	};
++};
+diff -Nru linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-spi.dts linux-4.4/arch/arm/boot/dts/imx53-usbarmory-spi.dts
+--- linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-spi.dts	1969-12-31 18:00:00.000000000 -0600
++++ linux-4.4/arch/arm/boot/dts/imx53-usbarmory-spi.dts	2016-02-04 08:31:38.730794858 -0600
+@@ -0,0 +1,45 @@
++/*
++ * USB armory MkI device mode device tree file
++ * https://inversepath.com/usbarmory
++ *
++ * Copyright (C) 2015, Inverse Path
++ * Andrej Rosano <andrej@inversepath.com>
++ *
++ * Licensed under GPLv2
++ */
++
++/dts-v1/;
++
++#include "imx53-usbarmory-common.dtsi"
++
++&usbotg {
++	dr_mode = "peripheral";
++	status = "okay";
++};
++
++&uart1 {
++	status = "disabled";
++};
++
++&iomuxc {
++	pinctrl-0 = <&pinctrl_ecspi2>;
++};
++
++&ecspi2 {
++	fsl,spi-num-chipselects = <2>;
++	cs-gpios = <&gpio5 29 0>, <&gpio5 30 0>;
++	status = "okay";
++
++	flash: m25p40@0 {
++		#address-cells = <1>;
++		#size-cells = <1>;
++		compatible = "st,m25p40", "st,m25p";
++		spi-max-frequency = <20000000>;
++		reg = <0>;
++
++		partition@0 {
++			label = "test-partition";
++			reg = <0x0 0x80000>;
++		};
++	};
++};
+diff -Nru linux-4.4-orig/arch/arm/boot/dts/Makefile linux-4.4/arch/arm/boot/dts/Makefile
+--- linux-4.4-orig/arch/arm/boot/dts/Makefile	2016-02-04 13:29:20.880919101 -0600
++++ linux-4.4/arch/arm/boot/dts/Makefile	2016-02-04 13:27:10.733849955 -0600
+@@ -278,6 +278,10 @@
+ 	imx53-smd.dtb \
+ 	imx53-tx53-x03x.dtb \
+ 	imx53-tx53-x13x.dtb \
++	imx53-usbarmory.dtb \
++	imx53-usbarmory-host.dtb \
++	imx53-usbarmory-i2c.dtb \
++	imx53-usbarmory-gpio.dtb \
+ 	imx53-voipac-bsb.dtb
+ dtb-$(CONFIG_SOC_IMX6Q) += \
+ 	imx6dl-apf6dev.dtb \
diff --git a/modules/nixos-hardware/lenovo/ideapad/default.nix b/modules/nixos-hardware/lenovo/ideapad/default.nix
new file mode 100644
index 000000000000..d774ba3793af
--- /dev/null
+++ b/modules/nixos-hardware/lenovo/ideapad/default.nix
@@ -0,0 +1,3 @@
+{
+  imports = [ ../../common/pc/laptop ];
+}
diff --git a/modules/nixos-hardware/lenovo/ideapad/z510/default.nix b/modules/nixos-hardware/lenovo/ideapad/z510/default.nix
new file mode 100644
index 000000000000..83f656806854
--- /dev/null
+++ b/modules/nixos-hardware/lenovo/ideapad/z510/default.nix
@@ -0,0 +1,11 @@
+{ lib, ... }:
+
+{
+  imports = [
+    ../.
+    ../../../common/cpu/intel
+  ];
+
+  # https://github.com/NixOS/nixpkgs/issues/18356
+  boot.blacklistedKernelModules = [ "nouveau" ];
+}
diff --git a/modules/nixos-hardware/lenovo/thinkpad/default.nix b/modules/nixos-hardware/lenovo/thinkpad/default.nix
new file mode 100644
index 000000000000..ff22639b4fdc
--- /dev/null
+++ b/modules/nixos-hardware/lenovo/thinkpad/default.nix
@@ -0,0 +1,10 @@
+{ lib, pkgs, ... }:
+
+{
+  imports = [ ../../common/pc/laptop ];
+
+  hardware.trackpoint.enable = lib.mkDefault true;
+
+  # Fingerprint reader: login and unlock with fingerprint (if you add one with `fprintd-enroll`)
+  # services.fprintd.enable = true;
+}
diff --git a/modules/nixos-hardware/lenovo/thinkpad/t410/default.nix b/modules/nixos-hardware/lenovo/thinkpad/t410/default.nix
new file mode 100644
index 000000000000..c40801ffc0bc
--- /dev/null
+++ b/modules/nixos-hardware/lenovo/thinkpad/t410/default.nix
@@ -0,0 +1,36 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ../.
+    ../tp-smapi.nix
+    ../../../common/cpu/intel
+  ];
+
+  boot = {
+    # TODO: this configuration seems to be very aggressive.
+    # Ask @peti if it's stable or not.
+    kernelParams = [
+      "drm.debug=0"
+      "drm.vblankoffdelay=1"
+      "i915.semaphores=1"
+      "i915.modeset=1"
+      "i915.use_mmio_flip=1"
+      "i915.powersave=1"
+      "i915.enable_ips=1"
+      "i915.disable_power_well=1"
+      "i915.enable_hangcheck=1"
+      "i915.enable_cmd_parser=1"
+      "i915.fastboot=0"
+      "i915.enable_ppgtt=1"
+      "i915.reset=0"
+      "i915.lvds_use_ssc=0"
+      "i915.enable_psr=0"
+      "vblank_mode=0"
+      "i915.i915_enable_rc6=1"
+    ];
+    blacklistedKernelModules = [
+      "sierra_net" "cdc_mbim" "cdc_ncm" "btusb"
+    ];
+  };
+}
diff --git a/modules/nixos-hardware/lenovo/thinkpad/t430/default.nix b/modules/nixos-hardware/lenovo/thinkpad/t430/default.nix
new file mode 100644
index 000000000000..09cee74942e9
--- /dev/null
+++ b/modules/nixos-hardware/lenovo/thinkpad/t430/default.nix
@@ -0,0 +1,15 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ../.
+    ../../../common/cpu/intel
+  ];
+
+  boot = {
+    kernelParams = [
+      # fixes brightness keys, see https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_T430s
+      "acpi_osi\='!Windows 2012'"
+    ];
+  };
+}
diff --git a/modules/nixos-hardware/lenovo/thinkpad/t440p/default.nix b/modules/nixos-hardware/lenovo/thinkpad/t440p/default.nix
new file mode 100644
index 000000000000..4dd4085794fa
--- /dev/null
+++ b/modules/nixos-hardware/lenovo/thinkpad/t440p/default.nix
@@ -0,0 +1,16 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ../.
+    ../../../common/cpu/intel
+  ];
+
+  boot = {
+    extraModprobeConfig = lib.mkDefault ''
+      options bbswitch use_acpi_to_detect_card_state=1
+    '';
+    # TODO: probably enable tcsd? Is this line necessary?
+    kernelModules = [ "tpm-rng" ];
+  };
+}
diff --git a/modules/nixos-hardware/lenovo/thinkpad/t450s/default.nix b/modules/nixos-hardware/lenovo/thinkpad/t450s/default.nix
new file mode 100644
index 000000000000..e62337171b9a
--- /dev/null
+++ b/modules/nixos-hardware/lenovo/thinkpad/t450s/default.nix
@@ -0,0 +1,9 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ../../../common/cpu/intel
+    ../../../common/pc/laptop/acpi_call.nix
+    ../.
+  ];
+}
diff --git a/modules/nixos-hardware/lenovo/thinkpad/t460s/default.nix b/modules/nixos-hardware/lenovo/thinkpad/t460s/default.nix
new file mode 100644
index 000000000000..41558a35b7f6
--- /dev/null
+++ b/modules/nixos-hardware/lenovo/thinkpad/t460s/default.nix
@@ -0,0 +1,12 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ../../../common/cpu/intel
+    ../.
+  ];
+
+  # TODO: boot loader
+  boot.loader.systemd-boot.enable = lib.mkDefault true;
+  boot.loader.efi.canTouchEfiVariables = lib.mkDefault true;
+}
diff --git a/modules/nixos-hardware/lenovo/thinkpad/t480s/default.nix b/modules/nixos-hardware/lenovo/thinkpad/t480s/default.nix
new file mode 100644
index 000000000000..3e079d5fb060
--- /dev/null
+++ b/modules/nixos-hardware/lenovo/thinkpad/t480s/default.nix
@@ -0,0 +1,10 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ../../../common/cpu/intel
+    ../../../common/pc/laptop/acpi_call.nix
+    ../../../common/pc/laptop/cpu-throttling-bug.nix
+    ../.
+  ];
+}
diff --git a/modules/nixos-hardware/lenovo/thinkpad/tp-smapi.nix b/modules/nixos-hardware/lenovo/thinkpad/tp-smapi.nix
new file mode 100644
index 000000000000..451dd28ece03
--- /dev/null
+++ b/modules/nixos-hardware/lenovo/thinkpad/tp-smapi.nix
@@ -0,0 +1,11 @@
+# tp_smapi works on ThinkPads made before 2013. See compat table:
+# https://www.thinkwiki.org/wiki/Tp_smapi#Model-specific_status
+
+{ config, ... }:
+
+{
+  boot = {
+    kernelModules = [ "tp_smapi" ];
+    extraModulePackages = with config.boot.kernelPackages; [ tp_smapi ];
+  };
+}
diff --git a/modules/nixos-hardware/lenovo/thinkpad/x1/6th-gen/QHD/default.nix b/modules/nixos-hardware/lenovo/thinkpad/x1/6th-gen/QHD/default.nix
new file mode 100644
index 000000000000..0b8555fbfb08
--- /dev/null
+++ b/modules/nixos-hardware/lenovo/thinkpad/x1/6th-gen/QHD/default.nix
@@ -0,0 +1,36 @@
+# X1 6th generation with a QHD (2560x1440px) display
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ../.
+  ];
+
+  # Fix font sizes in X
+  services.xserver.dpi = 210;
+  fonts.fontconfig.dpi = 210;
+
+  # Fix sizes of GTK/GNOME ui elements
+  environment.variables = {
+    GDK_SCALE = lib.mkDefault "2";
+    GDK_DPI_SCALE= lib.mkDefault "0.5";
+  };
+  # Enable readable font on console. The example configuration that
+  # follows is taliored towards western languages. To see how to
+  # configure the font download the source tarball from
+  # http://terminus-font.sourceforge.net/ and read the README file on
+  # the root dir
+
+  # i18n = {
+  #   # this means ISO8859-1 or ISO8859-15 or Windows-1252 codepages
+  #   # (ter-1), 16x32 px (32), normal font weight (n)
+  #   consoleFont = "ter-132n";
+  #   consoleKeyMap = "us";
+  #   defaultLocale = "en_US.UTF-8";
+  #   consolePackages = [ pkgs.terminus_font ];
+  # };
+
+  # Early configure the console to make the font readable from the
+  # start
+  # boot.earlyVconsoleSetup = true;
+}
diff --git a/modules/nixos-hardware/lenovo/thinkpad/x1/6th-gen/default.nix b/modules/nixos-hardware/lenovo/thinkpad/x1/6th-gen/default.nix
new file mode 100644
index 000000000000..9584bc744571
--- /dev/null
+++ b/modules/nixos-hardware/lenovo/thinkpad/x1/6th-gen/default.nix
@@ -0,0 +1,32 @@
+# A good source of information about how to fix the issues still
+# standing with kernel 4.6.11 is the following wiki page:
+# https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6). The
+# TrackPoint and TouchPad issues there seem to have been fixed already.
+
+{ config, pkgs, ... }:
+{
+  imports = [
+    ../.
+    ../../../../common/pc/laptop/acpi_call.nix
+    ../../../../common/pc/laptop/cpu-throttling-bug.nix
+  ];
+
+  # See https://linrunner.de/en/tlp/docs/tlp-faq.html#battery
+  services.tlp.extraConfig = ''
+    START_CHARGE_THRESH_BAT0=75
+    STOP_CHARGE_THRESH_BAT0=80
+    CPU_SCALING_GOVERNOR_ON_BAT=powersave
+    ENERGY_PERF_POLICY_ON_BAT=powersave
+  '';
+
+  # Enable S3 suspend state: you have to manually follow the
+  # instructions shown here: https://delta-xi.net/#056 in order to
+  # produce the ACPI patched table. Put the CPIO archive in /boot and
+  # then enable the following lines
+  # boot.kernelParams = [
+  #   "mem_sleep_default=deep"
+  # ];
+  # boot.initrd.prepend = [
+  #   "${/boot/acpi_override}"
+  # ];
+}
diff --git a/modules/nixos-hardware/lenovo/thinkpad/x1/default.nix b/modules/nixos-hardware/lenovo/thinkpad/x1/default.nix
new file mode 100644
index 000000000000..870d9a857742
--- /dev/null
+++ b/modules/nixos-hardware/lenovo/thinkpad/x1/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ../.
+    ../../../common/cpu/intel
+  ];
+}
diff --git a/modules/nixos-hardware/lenovo/thinkpad/x140e/default.nix b/modules/nixos-hardware/lenovo/thinkpad/x140e/default.nix
new file mode 100644
index 000000000000..c03410e936e2
--- /dev/null
+++ b/modules/nixos-hardware/lenovo/thinkpad/x140e/default.nix
@@ -0,0 +1,14 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ../.
+    ../../../common/cpu/amd
+  ];
+
+  boot.extraModprobeConfig = lib.mkDefault ''
+    options snd_hda_intel enable=0,1
+  '';
+
+  services.xserver.videoDrivers = [ "ati" ];
+}
diff --git a/modules/nixos-hardware/lenovo/thinkpad/x220/default.nix b/modules/nixos-hardware/lenovo/thinkpad/x220/default.nix
new file mode 100644
index 000000000000..3cf18e397469
--- /dev/null
+++ b/modules/nixos-hardware/lenovo/thinkpad/x220/default.nix
@@ -0,0 +1,10 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ../.
+    ../../../common/cpu/intel
+    ../../../common/pc/laptop/hdd # TODO: reverse compat
+    ../tp-smapi.nix
+  ];
+}
diff --git a/modules/nixos-hardware/lenovo/thinkpad/x230/default.nix b/modules/nixos-hardware/lenovo/thinkpad/x230/default.nix
new file mode 100644
index 000000000000..58b09f4c5d5f
--- /dev/null
+++ b/modules/nixos-hardware/lenovo/thinkpad/x230/default.nix
@@ -0,0 +1,19 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ../.
+    ../../../common/cpu/intel
+    ../../../common/pc/laptop/acpi_call.nix
+  ];
+
+  boot = {
+    kernelModules = [
+      "tpm-rng"
+    ];
+  };
+
+  services.xserver.deviceSection = lib.mkDefault ''
+    Option "TearFree" "true"
+  '';
+}
diff --git a/modules/nixos-hardware/lenovo/thinkpad/x250/default.nix b/modules/nixos-hardware/lenovo/thinkpad/x250/default.nix
new file mode 100644
index 000000000000..870d9a857742
--- /dev/null
+++ b/modules/nixos-hardware/lenovo/thinkpad/x250/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ../.
+    ../../../common/cpu/intel
+  ];
+}
diff --git a/modules/nixos-hardware/lenovo/thinkpad/x260/default.nix b/modules/nixos-hardware/lenovo/thinkpad/x260/default.nix
new file mode 100644
index 000000000000..d64a53075163
--- /dev/null
+++ b/modules/nixos-hardware/lenovo/thinkpad/x260/default.nix
@@ -0,0 +1,12 @@
+{
+  imports = [
+    ../.
+    ../../../common/cpu/intel
+    ../../../common/pc/laptop/acpi_call.nix
+  ];
+
+  # https://wiki.archlinux.org/index.php/TLP#Btrfs
+  services.tlp.extraConfig = ''
+    SATA_LINKPWR_ON_BAT=med_power_with_dipm
+  '';
+}
diff --git a/modules/nixos-hardware/lenovo/thinkpad/x270/default.nix b/modules/nixos-hardware/lenovo/thinkpad/x270/default.nix
new file mode 100644
index 000000000000..870d9a857742
--- /dev/null
+++ b/modules/nixos-hardware/lenovo/thinkpad/x270/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ../.
+    ../../../common/cpu/intel
+  ];
+}
diff --git a/modules/nixos-hardware/microsoft/hyper-v/README.md b/modules/nixos-hardware/microsoft/hyper-v/README.md
new file mode 100644
index 000000000000..f396214e09fd
--- /dev/null
+++ b/modules/nixos-hardware/microsoft/hyper-v/README.md
@@ -0,0 +1,63 @@
+This is a setup for installing NixOS in Hyper-V as a guest.
+
+I don't have details handy anymore on the detailed steps I had to do on the Windows host
+(there's no NixWindows yet, unfortunately...), so you'll have to try googling that yourself, e.g. something like
+"linux on hyper-v" or "ubuntu on hyper-v". (You're welcome to send PRs with improvements of this guide.)
+Below, I'm providing only the info with what to do on the NixOS side of things.
+
+## Installation ##
+
+I basically followed the [guide for NixOS on VirtualBox](https://nixos.org/wiki/Installing_NixOS_in_a_VirtualBox_guest).
+However, some additional changes in `/etc/nixos/configuration.nix` were required to really make it work
+(I don't include them as a .nix file, as they must be done **before `nixos-install`**, and I'm not sure how to proceed
+with cloning the nixos-hardware repo at this stage):
+
+    # REQUIRED - see: https://github.com/nixos/nixpkgs/issues/9899
+    boot.initrd.kernelModules = ["hv_vmbus" "hv_storvsc"];
+
+    # RECOMMENDED
+    # - use 800x600 resolution for text console, to make it easy to fit on screen
+    boot.kernelParams = ["video=hyperv_fb:800x600"];  # https://askubuntu.com/a/399960
+    # - avoid a problem with `nix-env -i` running out of memory
+    boot.kernel.sysctl."vm.overcommit_memory" = "1"; # https://github.com/NixOS/nix/issues/421
+
+    # UNKNOWN - not sure if below are needed; were suggested for VirtualBox and I used them
+    boot.loader.grub.device = "/dev/sda";
+    boot.initrd.checkJournalingFS = false;
+
+## Shared folder ##
+
+To share a folder between Windows host and Linux/NixOS guest, the typical solution seems to be to make a folder "shared"
+on Windows, then access it via Samba from NixOS.
+On the Windows host, I had to make an additional virtual switch in Hyper-V Manager, with mode "internal".
+Then in properties of the virtual network card on Windows host (attached to the virtual switch), I
+changed the IP to a fixed 10.0.0.100 (mask 255.255.255.240). I also added a special purpose user on the host, with some
+long randomly generated password, to act as Samba credentials for NixOS.
+To test that it works, I used the following commands:
+
+    $ nix-env -iA nixos.samba
+    $ smbclient -L //10.0.0.100 -U shares-guest%ReplaceWithSomeLongRandomlyGeneratedPassword
+    Domain=[DESKTOP-ABCD123] OS=[Windows 10 Pro 14393] Server=[Windows 10 Pro 6.3]
+    
+    	Sharename       Type      Comment
+    	---------       ----      -------
+    	ADMIN$          Disk      Administracja zdalna
+    	C$              Disk      Domyślny udział
+    	IPC$            IPC       Zdalne wywołanie IPC 
+    	shared-space    Disk      
+    Connection to 10.0.0.100 failed (Error NT_STATUS_RESOURCE_NAME_NOT_FOUND)
+    NetBIOS over TCP disabled -- no workgroup available
+
+    $ nix-env -e samba
+
+Then I added the following lines in `/etc/nixos/configuration.nix`:
+
+    # Client for shared folder on Windows Hyper-V host
+    # Based on: nixpkgs.git/nixos/tests/samba.nix
+    fileSystems."/vm-share" = {
+      fsType = "cifs";
+      device = "//10.0.0.100/shared-space";
+      options = [ "username=shares-guest" "password=ReplaceWithSomeLongRandomlyGeneratedPassword" ];
+    };
+    networking.interfaces.eth1.ip4 = [{address="10.0.0.101"; prefixLength=28;}];
+
diff --git a/modules/nixos-hardware/microsoft/surface-pro/3/README.wiki b/modules/nixos-hardware/microsoft/surface-pro/3/README.wiki
new file mode 100644
index 000000000000..9ffdc559e183
--- /dev/null
+++ b/modules/nixos-hardware/microsoft/surface-pro/3/README.wiki
@@ -0,0 +1,41 @@
+Work in progress. This is the setup for a dual-boot windows/NixOS. 
+
+== Installation ==
+
+Current requirements:
+* USB stick
+* Latest unstable minimal installation iso, I used [[https://nixos.org/releases/nixos/unstable/nixos-15.05pre61665.4c01e6d/nixos-minimal-15.05pre61665.4c01e6d-x86_64-linux.iso the 15.06-pre one]]
+* (maybe) USB keyboard and therefore a USB hub
+* WiFi SSID and password
+
+In the current installation iso, the kernel doesn't support the MS Type cover yet, so you need a USB keyboard for the initial install. Also note that at one point the keyboard wasn't working, and I couldn't see it in lsusb output. After a cold boot it worked fine.
+
+=== Steps ===
+
+Preparation:
+* Copy the ISO to the USB stick as explained [[https://nixos.org/nixos/manual/sec-installation.html#sec-booting-from-usb in the manual]]. Note that if you just dd the image onto the USB stick, it will boot without changes
+* With Windows Disk Management, shrink the windows disk so you have room for your installation. Use the free space to create a new partition without a filesystem or drive letter.
+* Check out [[https://github.com/cransom/surface-pro-3-nixos this expression and set of patches]] and add it to support newer versions of the Type Cover as well as enable the touch screen.
+
+* Reboot the Surface and furiously tap Esc until you end up in the BIOS screen. There, turn off secure boot (don't delete the keys), and change the boot order to USB + SSD. Save.
+* You should now be in the NixOS installer
+* Attach the USB stick and keyboard if the Type Cover doesn't work. The NixOS manual is at alt+F8
+
+Installation:
+* Using gdisk, print your partition table to find the empty partition you created. Find the EFI partition number (1 for me) and your new partition number (5 for me).
+* Create your filesystem of choice on the partition, I picked btrfs: `mkfs.btrfs -L root /dev/disk/by-id/xxx-5` (xxx is the samsung ssd). Mount it on /mnt.
+** With btrfs it's wise to put the nix store in its own subvolume: `btrfs subvol create /mnt/nix; btrfs subvol create /mnt/nix/store`
+* We'll be using Gummiboot, which needs to access the EFI partition. `mkdir /mnt/boot; mount /dev/disk/by-id/xxx-1`
+* Initialize your hardware configuration: `nixos-generate-config --root /mnt`
+* Create your wifi credentials: `wpa_passphrase SSID PASS > /etc/wpa_supplicant.conf; cp /etc/wpa_supplicant.conf /mnt/etc`. Check that ifconfig gets an ip address.
+* Edit /mnt/etc/configuration.nix, making sure that you have at least:
+   <nowiki>networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+  # be able to use the type cover in the initrd
+  boot.kernelModules = [ "hid-microsoft" ];</nowiki>
+* Install: `nixos-install`
+
+If this completes successfully, you should be able to reboot, remove the USB stick, and NixOS should come up.
+
+'''Note''': If using the hid-multitouch patch, you can boot windows as well as other profiles of NixOS without using a usb keyboard.
diff --git a/modules/nixos-hardware/microsoft/surface-pro/3/default.nix b/modules/nixos-hardware/microsoft/surface-pro/3/default.nix
new file mode 100644
index 000000000000..a09c60b1f205
--- /dev/null
+++ b/modules/nixos-hardware/microsoft/surface-pro/3/default.nix
@@ -0,0 +1,9 @@
+{ lib, ... }:
+
+{
+  # to use the type cover in the initrd
+  boot.kernelModules = [ "hid-microsoft" ];
+
+  # TODO: reverse compat
+  networking.wireless.enable = lib.mkDefault true;
+}
diff --git a/modules/nixos-hardware/pcengines/apu/default.nix b/modules/nixos-hardware/pcengines/apu/default.nix
new file mode 100644
index 000000000000..f59f35a25426
--- /dev/null
+++ b/modules/nixos-hardware/pcengines/apu/default.nix
@@ -0,0 +1,3 @@
+{
+  boot.kernelParams = [ "console=ttyS0,115200n8" ];
+}
diff --git a/modules/nixos-hardware/purism/librem/13v3/README.md b/modules/nixos-hardware/purism/librem/13v3/README.md
new file mode 100644
index 000000000000..8009eb3279c4
--- /dev/null
+++ b/modules/nixos-hardware/purism/librem/13v3/README.md
@@ -0,0 +1,12 @@
+Librem comes with Coreboot + SeaBIOS payload. That means EFI boot is not
+possible. Use `fdisk` to partition hard drive, and GRUB as a bootloader:
+
+```nix
+{
+  boot.loader.grub = {
+    enable = true;
+    device = "/dev/sda";
+    version = 2;
+  };
+}
+```
diff --git a/modules/nixos-hardware/purism/librem/13v3/default.nix b/modules/nixos-hardware/purism/librem/13v3/default.nix
new file mode 100644
index 000000000000..89ae07e4e693
--- /dev/null
+++ b/modules/nixos-hardware/purism/librem/13v3/default.nix
@@ -0,0 +1,13 @@
+{
+  imports = [
+    ../../../common/cpu/intel
+    ../../../common/pc/laptop
+  ];
+
+  # https://github.com/systemd/systemd/pull/9318
+  services.udev.extraHwdb = ''
+    # Purism Librem 13 V3
+    evdev:atkbd:dmi:bvn*:bvr*:bd*:svnPurism*:pn*Librem13v3*:pvr*
+     KEYBOARD_KEY_56=backslash
+  '';
+}
diff --git a/modules/nixos-hardware/raspberry-pi/2/README.org b/modules/nixos-hardware/raspberry-pi/2/README.org
new file mode 100644
index 000000000000..842919b1acf4
--- /dev/null
+++ b/modules/nixos-hardware/raspberry-pi/2/README.org
@@ -0,0 +1,23 @@
+** Status
+
+The code in master as of June 2015 should be able to prepare a bootable NixOS
+for Raspberry PI 2.
+
+There are still some drawbacks:
+
+NixOS does not provide a /boot/config.txt (the FAT32 partition). Making NixOS
+work in the Raspberry PI 2 is mainly the result of the recent work of ambro718,
+Dezgeg and viric (#nixos@irc.freenode.net).
+
+** Download
+
+If you want to test, you can flash this 4GB SD image (DOS partition table +
+fat32 + ext4 rootfs):
+
+magnet:?xt=urn:btih:0def3f6acb3bceddb22cb24098f58e40e2853ec2&dn=rpi2-nixos-4b09501f2-img.xz&tr=udp%3A%2F%2Fopen.demonii.com%3A1337&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A80
+
+Then you should be able to nixos-rebuild any configuration.nix changes.
+
+The image is the result of a "nixos-install" alone. No root password has been
+set, and it does not include a nixpkgs checkout or channel. In fact I (viric)
+created the FS into a NBD, not a real SD, to create this image.
diff --git a/modules/nixos-hardware/raspberry-pi/2/default.nix b/modules/nixos-hardware/raspberry-pi/2/default.nix
new file mode 100644
index 000000000000..bc9ca2ab0c23
--- /dev/null
+++ b/modules/nixos-hardware/raspberry-pi/2/default.nix
@@ -0,0 +1,32 @@
+{ lib, pkgs, ...}:
+
+{
+  boot = {
+    consoleLogLevel = lib.mkDefault 7;
+    extraTTYs = [ "ttyAMA0" ];
+    kernelPackages = lib.mkDefault pkgs.linuxPackages_rpi;
+    kernelParams = [
+      "dwc_otg.lpm_enable=0"
+      "console=ttyAMA0,115200"
+      "rootwait"
+      "elevator=deadline"
+    ];
+    loader = {
+      grub.enable = lib.mkDefault false;
+      generationsDir.enable = lib.mkDefault false;
+      raspberryPi = {
+        enable = lib.mkDefault true;
+	version = lib.mkDefault 2;
+      };
+    };
+  };
+
+  nix.buildCores = 4;
+
+  nixpkgs.config.platform = lib.systems.platforms.raspberrypi2;
+
+  # cpufrequtils doesn't build on ARM
+  powerManagement.enable = lib.mkDefault false;
+
+  services.openssh.enable = lib.mkDefault true;
+}
diff --git a/modules/nixos-hardware/samsung/np900x3c/README.wiki b/modules/nixos-hardware/samsung/np900x3c/README.wiki
new file mode 100644
index 000000000000..e9fc58b8613b
--- /dev/null
+++ b/modules/nixos-hardware/samsung/np900x3c/README.wiki
@@ -0,0 +1,94 @@
+= Overview =
+
+Most of the features seem to be working with Linux >= 3.9
+
+== Hardware ==
+
+* CPU Intel(R) Core(TM) i5-3317U CPU @ 1.70GHz
+* RAM 4 GB
+* HDD 128GB SSD
+* Screen 13.3-Inch Screen
+* Graphics Intel HD Graphics 4000, Ivy bridge
+
+= Configuration =
+
+Full configurations is in my
+[https://raw.github.com/grwlf/nixpkgs/local/machines/samsung-np900x3c-v2.nix nixpkgs branch]. Note, it requires several local packages.
+
+=== Touchpad ===
+
+Touchpad is detected as 'ETPS/2 Elantech Touchpad'. xf86-input-synaptics handles
+it well. Corresponding config lines:
+
+<pre>
+  services.xserver = {
+    synaptics = {
+      enable = true;
+      accelFactor = "0.05";
+      maxSpeed = "10";
+      twoFingerScroll = true;
+      additionalOptions =
+        ''
+        MatchProduct "ETPS"
+        Option "FingerLow"                 "3"
+        Option "FingerHigh"                "5"
+        Option "FingerPress"               "30"
+        Option "MaxTapTime"                "100"
+        Option "MaxDoubleTapTime"          "150"
+        Option "FastTaps"                  "1"
+        Option "VertTwoFingerScroll"       "1"
+        Option "HorizTwoFingerScroll"      "1"
+        Option "TrackstickSpeed"           "0"
+        Option "LTCornerButton"            "3"
+        Option "LBCornerButton"            "2"
+        Option "CoastingFriction"          "20"
+        '';
+      };
+  };
+</pre>
+
+=== Wireless ===
+
+System requires iwlwifi-6000g2b-6.ucode in order to work. I've extracted the
+file from some debian package and placed it into /root/firmware. Corresponding
+config settings:
+
+<pre>
+  hardware.firmware = [ "/root/firmware" ];
+</pre>
+
+= Problems =
+There are some. See
+
+* [http://ubuntuforums.org/showthread.php?t=1737086 Ubuntu thread]
+* [http://bugzilla.kernel.org/show_bug.cgi?id=44161 Kernel.org bug]
+* [http://jablonskis.org/2012/linux-and-samsung-series-laptop-9-fn-keys/ jablonskis.org]
+
+=== BIOS problems ===
+I had to disable SSD boot completely in order to boot from USB. Just changing boot priority didn't help.
+
+Fix: Update BIOS up to recent version
+
+=== Battery ===
+Battery charging/discharging indicator doesn't work good.
+
+Fix: Update BIOS up to recent version
+
+=== Lid ===
+Acpi thinks lid is always open
+<pre>
+[ierton@greyblade:~]$ cat /proc/acpi/button/lid/LID0/state 
+state:      open
+</pre>
+
+Related [https://bugzilla.kernel.org/show_bug.cgi?id=44161 Kernel bug #44161]
+
+=== Multimedia keys ===
+* rfkill/fanless don't work
+* volume up/down don't work
+* brightness up/down work, but release is broken
+* touchpad disable works
+
+Related discussion on
+[http://jablonskis.org/2012/linux-and-samsung-series-laptop-9-fn-keys/ jablonskis.org]
+
diff --git a/modules/nixos-hardware/samsung/np900x3c/default.nix b/modules/nixos-hardware/samsung/np900x3c/default.nix
new file mode 100644
index 000000000000..ced3d7013dd8
--- /dev/null
+++ b/modules/nixos-hardware/samsung/np900x3c/default.nix
@@ -0,0 +1,7 @@
+# TODO: use ../../common/pc/laptop
+
+{ lib, ... }:
+
+{
+  services.xserver.synaptics.enable = lib.mkDefault true;
+}
diff --git a/modules/nixos-hardware/supermicro/a1sri-2758f/default.nix b/modules/nixos-hardware/supermicro/a1sri-2758f/default.nix
new file mode 100644
index 000000000000..3ffdc0c6e6d2
--- /dev/null
+++ b/modules/nixos-hardware/supermicro/a1sri-2758f/default.nix
@@ -0,0 +1,9 @@
+# http://www.supermicro.com/products/motherboard/Atom/X10/A1SRi-2758F.cfm
+# This board contains a TPM header, but you must supply your own module.
+
+{ pkgs, ... }:
+
+{
+  boot.kernelModules = [ "ipmi_devintf" "ipmi_si" ];
+  environment.systemPackages = [ pkgs.ipmitool ];
+}
diff --git a/modules/nixos-hardware/supermicro/x10sll-f/default.nix b/modules/nixos-hardware/supermicro/x10sll-f/default.nix
new file mode 100644
index 000000000000..10c6cc016035
--- /dev/null
+++ b/modules/nixos-hardware/supermicro/x10sll-f/default.nix
@@ -0,0 +1,12 @@
+{ config, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [ ipmitool ];
+
+  boot.kernelModules = [ "jc42" "ipmi_devintf" "ipmi_si" "tpm_rng" ];
+
+  # services.cron.systemCronJobs = [
+  #   # Reset 5-minute watchdog timer every minute
+  #   "* * * * * ${pkgs.ipmitool}/bin/ipmitool raw 0x30 0x97 1 5"
+  # ];
+}
diff --git a/modules/nixos-hardware/toshiba/swanky/README.md b/modules/nixos-hardware/toshiba/swanky/README.md
new file mode 100644
index 000000000000..ab4c072c6b09
--- /dev/null
+++ b/modules/nixos-hardware/toshiba/swanky/README.md
@@ -0,0 +1,66 @@
+# Toshiba Chromebook 2 `swanky`
+
+There might be a way to install NixOS without hardware modifications (via
+enabled developer mode and SeaBIOS boot on Ctrl+L), however I'd highly
+recommend replacing Google's Coreboot payload with Tianocore: that allows for
+proper virtualization, suspend, removes annoying developer mode screen, and
+generally just works much better.
+
+These instructions carry some risk of bricking your device, since you'll be
+reflashing BIOS. Risk is rather low, but please for the love of god make a BIOS
+backup and store it someplace safe. That's the only way to reinstall ChromeOS
+back after this procedure (BIOS image has licensing info), and it's much easier
+to use a known good state to unbrick the laptop if things go wrong.
+
+If you ever get unlucky, you can unbrick your device using Raspberry Pi,
+some cables and a SOIC clip, see:
+http://sicarul.com/how-to-un-brick-your-toshiba-chromebook-2-gandof-without-invoking-any-demons/
+
+## Enable developer mode
+
+This will wipe all user data and settings from the laptop.
+
+Power off, then hold ESC + Refresh (F3) and abruptly press power button. You
+should see "Chrome OS is missing or damaged" message. Press Ctrl+D. Press enter
+at the next screen, then press Ctrl+D again. Wait until the laptop boots into
+ChromeOS, then power it off.
+
+## Disable hardware-backed BIOS write protection
+
+Follow the first part of the guide at:
+https://github.com/brendenyule/NativeToshibaCB2Guide/wiki/Remove-Write-Protect
+
+Ignore SeaBIOS section. I also used some ductape over #5 to make sure that
+metallic motherboard shield would not re-enable write protection.
+
+## Flash Coreboot + Tianocore BIOS
+
+Prepare a FAT32-formatted flash drive for BIOS backup in advance.
+
+Go through ChromeOS installation dialogues until you have network access and
+are able to log into a guest session. Open Chrome, press Ctrl+Alt+T to open
+`crosh`, type in `shell` to get a real shell. Then, run:
+
+```
+$ cd ~
+$ curl -LO https://mrchromebox.tech/firmware-util.sh
+$ sudo bash firmware-util.sh
+```
+
+Choose "Install/Update Full ROM Firmware" option and follow instructions.
+Do not skip BIOS backup!
+
+Documentation: https://mrchromebox.tech/#fwscript
+
+## Enable hardware-backed BIOS write protection
+
+This is a cool security feature, so after flashing Coreboot + Tianocore BIOS
+and making sure new BIOS works, consider re-enabling BIOS protection. Just put
+in the missing screw #5.
+
+## Install NixOS
+
+`dd` an image on a flash drive, partition the drive, etc. On some later models,
+you can swap SSD with any other 2242 M.2 SATA SSD, but on `swanky`, you have
+to live with what you have (16GB eMMC). I recommend `256MB` for EFI partition,
+and the rest for `/`.
diff --git a/modules/nixos-hardware/toshiba/swanky/default.nix b/modules/nixos-hardware/toshiba/swanky/default.nix
new file mode 100644
index 000000000000..9504d147db00
--- /dev/null
+++ b/modules/nixos-hardware/toshiba/swanky/default.nix
@@ -0,0 +1,30 @@
+{ lib, pkgs, ... }:
+
+let
+  ucm = pkgs.fetchzip {
+    url = "https://github.com/plbossart/UCM/archive/2050ca78a4d1a853d1ba050b591f42e6f97adfc0.tar.gz";
+    sha256 = "1rs4mpz3b965nmz0yhy6j4ga3fdz320qnpkd7d61nvpv9c3i6zwj";
+  };
+in
+
+{
+  imports = [
+    ../../common/cpu/intel
+    ../../common/pc/laptop
+  ];
+
+  # Sound only properly works out of the box on 4.18+ kernels.
+  boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
+
+  # Required for screen brightness control:
+  boot.kernelParams = [ "acpi_backlight=vendor" ];
+
+  # Sound requires a custom UCM config:
+  system.replaceRuntimeDependencies = [{
+    original = pkgs.alsaLib;
+
+    replacement = pkgs.alsaLib.overrideAttrs (super: {
+      postFixup = "cp -r ${ucm}/chtmax98090 $out/share/alsa/ucm";
+    });
+  }];
+}
diff --git a/modules/shell/default.nix b/modules/shell/default.nix
new file mode 100644
index 000000000000..612de568c962
--- /dev/null
+++ b/modules/shell/default.nix
@@ -0,0 +1,36 @@
+{ pkgs, ... }:
+
+{
+  imports = [ ./git ./kakoune ./less ./lynx ./tmux ./zsh ];
+
+  environment.systemPackages = with pkgs; [
+    coreutils-prefixed
+    curl
+    execline
+    file
+    fzf
+    gnused
+    gotop
+    htop
+    httpie
+    jq
+    moreutils
+    ncdu
+    neovim
+    nmap
+    openssh
+    pass
+    pv
+    ranger
+    silver-searcher
+    traceroute
+    tree
+    units
+    unixtools.watch
+    wget
+    whois
+  ] ++ lib.optional stdenv.isDarwin pinentry_mac;
+
+  environment.variables.EDITOR = "kak";
+  environment.variables.EMAIL = "hi@alyssa.is";
+}
diff --git a/modules/shell/git/attributes b/modules/shell/git/attributes
new file mode 100644
index 000000000000..24cb25b10aa7
--- /dev/null
+++ b/modules/shell/git/attributes
@@ -0,0 +1,3 @@
+*.json diff=json
+*.plist diff=plist
+*.json.mozlz4 diff=mozlz4
diff --git a/modules/shell/git/config.in b/modules/shell/git/config.in
new file mode 100644
index 000000000000..7c039ae0a45e
--- /dev/null
+++ b/modules/shell/git/config.in
@@ -0,0 +1,56 @@
+[alias]
+    ignore = "!gi() { curl -L -s https://www.gitignore.io/api/$@ ;}; gi"
+    unbranch = "!git branch --sort -HEAD --merged | sed 1d | xargs git branch -d"
+[branch]
+    autosetuprebase = always
+[color "branch"]
+    current = yellow reverse
+    local = yellow
+    remote = green
+[color "diff"]
+    frag = magenta bold
+    meta = yellow bold
+    new = green bold
+    old = red bold
+[color "status"]
+    added = yellow
+    changed = green
+    untracked = cyan
+[commit]
+    gpgsign = true
+    verbose = true
+[core]
+    attributesfile = @attributesfile@
+    excludesfile = @ignorefile@
+[credential]
+    helper = osxkeychain
+[diff]
+    compactionHeuristic = true
+    renameLimit = 0
+    wsErrorHighlight = all
+[diff "json"]
+    textconv = @python@/bin/python -m json.tool
+[diff "mozlz4"]
+    textconv = @mozlz4_textconv@
+[diff "plist"]
+    textconv = /usr/bin/plutil -convert xml1 -o -
+[filter "lfs"]
+    clean = git-lfs clean -- %f
+    required = true
+    smudge = git-lfs smudge -- %f
+[format]
+    pretty = format:%Cred%h %C(magenta)%G? %Cgreen(%ar)%Creset -%C(bold red)%d%Creset %s %C(bold blue)<%aN>%Creset
+[grep]
+    lineNumber = true
+    patternType = perl
+[help]
+    autocorrect = 1
+[hub]
+    protocol = ssh
+[merge]
+    conflictstyle = diff3
+    tool = opendiff
+[push]
+    default = current
+[sendemail]
+    smtpServer = @smtpServer@
diff --git a/modules/shell/git/default.nix b/modules/shell/git/default.nix
new file mode 100644
index 000000000000..8a7c10bfdb47
--- /dev/null
+++ b/modules/shell/git/default.nix
@@ -0,0 +1,38 @@
+{ pkgs, ... }:
+
+let
+  mozlz4_textconv = pkgs.substituteAll {
+    src = diff/mozlz4.in;
+    isExecutable = true;
+
+    inherit (pkgs) execline mozlz4a;
+    python = pkgs.python3;
+  };
+
+  # Git only supports absolute paths for this, so give it a wrapper
+  # program that execs the msmtp in PATH.
+  sendmail = pkgs.writeScript "git-sendmail" ''
+    #! ${pkgs.execline}/bin/execlineb -S0
+    msmtp $@
+  '';
+
+  config = pkgs.substituteAll {
+    src = ./config.in;
+
+    inherit mozlz4_textconv;
+    python = pkgs.python3;
+    smtpServer = sendmail;
+    attributesfile = ./attributes;
+    ignorefile = ./ignore;
+    preferLocalBuild = true;
+  };
+
+in
+{
+  environment.systemPackages = with pkgs; with gitAndTools; [
+    (git.override { svnSupport = true; sendEmailSupport = true; })
+    git-remote-hg
+  ];
+
+  xdg.config.users.qyliss.paths."git/config" = config;
+}
diff --git a/modules/shell/git/diff/mozlz4.in b/modules/shell/git/diff/mozlz4.in
new file mode 100644
index 000000000000..4377e69526c7
--- /dev/null
+++ b/modules/shell/git/diff/mozlz4.in
@@ -0,0 +1,4 @@
+#! @execline@/bin/execlineb -S1
+
+pipeline { @mozlz4a@/bin/mozlz4a -d $1 /dev/stdout }
+@python@/bin/python -m json.tool
diff --git a/modules/shell/git/ignore b/modules/shell/git/ignore
new file mode 100644
index 000000000000..412e6620e1af
--- /dev/null
+++ b/modules/shell/git/ignore
@@ -0,0 +1,22 @@
+# macOS
+.DS_Store
+
+# Kakoune
+*.kak.*
+
+# Sublime Text
+sublime-project
+sublime-workspace
+
+# IntelliJ IDEA
+.idea
+*.iml
+
+# Bundler
+gem_graph.png
+
+# Direnv
+.envrc
+
+# ctags
+/tags
diff --git a/modules/shell/kakoune/default.nix b/modules/shell/kakoune/default.nix
new file mode 100644
index 000000000000..c43a28e1cf06
--- /dev/null
+++ b/modules/shell/kakoune/default.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [ kakoune ];
+
+  xdg.config.users.qyliss.paths."kak/kakrc" = pkgs.copyPathToStore ./kakrc;
+}
diff --git a/modules/shell/kakoune/kakrc b/modules/shell/kakoune/kakrc
new file mode 100644
index 000000000000..9b670c7eb824
--- /dev/null
+++ b/modules/shell/kakoune/kakrc
@@ -0,0 +1,86 @@
+# Highlight any files whose names start with "zsh" as sh
+hook global BufCreate (.*/)?\.?zsh.* %{
+  set-option buffer filetype sh
+}
+
+# Highlight files ending in .conf as ini
+# (Will probably be close enough)
+hook global BufCreate .*\.conf %{
+  set-option buffer filetype ini
+}
+
+# Highlight files ending in .html.erb as html
+hook global BufCreate .*\.html.erb %{
+  set-option buffer filetype html
+}
+
+# Strip trailing whitespace on save
+hook global BufWritePre .*(?<!\.diff)$ %{
+  try %{execute-keys -draft %{%s\h+$<ret>d}}
+  echo
+}
+
+hook global WinSetOption filetype=mail %{
+  set-option buffer autowrap_column 72
+  autowrap-enable
+}
+
+define-command -docstring "import from the system clipboard" clipboard-import %{
+  set-register dquote %sh{pbpaste}
+  echo -markup "{Information}imported system clipboard to register """
+}
+
+define-command -docstring "export to the system clipboard" clipboard-export %{
+  nop %sh{ printf "%s" "$kak_main_reg_dquote" | pbcopy }
+  echo -markup "{Information}exported register "" to system clipboard"
+}
+
+define-command -docstring "open a file using fzf" open %{
+  edit %sh{git ls-files -oc --exclude-standard | choose}
+}
+alias global o open
+
+define-command -params 1.. -docstring "change file modes" chmod %{
+  nop %sh{ chmod $@ "$kak_buffile" }
+}
+
+define-command mkdirp %{
+  nop %sh{mkdir -p "$(dirname "$kak_buffile")"}
+}
+
+define-command mkdirpw %{
+  mkdirp
+  write
+}
+
+map global normal <a-Y> :clipboard-import<ret>
+map global normal <a-y> :clipboard-export<ret>
+
+map global normal / /(?i)
+
+# Allow indenting from any position in the line, with the correct indentation.
+map global insert <tab> '<a-;><a-gt>'
+map global insert <s-tab> '<a-;><lt>'
+
+map -docstring "Remove Symbol hashrockets" global user \
+  <gt> 's:\S+<space>+=<gt><ret>;<a-?><space>+<ret>c:<esc>h<a-/>:<ret>d'
+
+map -docstring "Convert single quotes to double quotes" global user \
+  %{'} %{s'<ret>r"}
+
+map -docstring "Toggle line comments" global user \
+  %{#} %{:comment-line<ret>}
+
+declare-user-mode bookmarks
+map -docstring "Edit bookmarked file" global user b \
+  %{:enter-user-mode bookmarks<ret>}
+
+map -docstring "wiki" global bookmarks w %{:edit-wiki-index<ret>}
+
+set-option global indentwidth 2
+set-option global ui_options ncurses_assistant=none
+set-option global scrolloff 5,5
+set-option global autoreload yes
+
+add-highlighter global/ number-lines -hlcursor -separator "│"
+add-highlighter global/ show-matching
diff --git a/modules/shell/less/default.nix b/modules/shell/less/default.nix
new file mode 100644
index 000000000000..bf6637ee3a7e
--- /dev/null
+++ b/modules/shell/less/default.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [ less ];
+
+  environment.variables.LESS = "cRS"; # use whole terminal, color, don't wrap
+}
diff --git a/modules/shell/lynx/default.nix b/modules/shell/lynx/default.nix
new file mode 100644
index 000000000000..9d7cb0a4930d
--- /dev/null
+++ b/modules/shell/lynx/default.nix
@@ -0,0 +1,16 @@
+{ pkgs, ... }:
+
+{
+  environment.extraInit = ''
+    export LYNX_CFG="/etc/xdg/nixos/per-user/$USER/lynx/lynx.cfg"
+    export LYNX_LSS="/etc/xdg/nixos/per-user/$USER/lynx/lynx.lss"
+  '';
+
+  environment.systemPackages = with pkgs; [ lynx ];
+
+  xdg.config.users.qyliss.paths."lynx/lynx.cfg" =
+    pkgs.copyPathToStore ./lynx.cfg;
+
+  xdg.config.users.qyliss.paths."lynx/lynx.lss" =
+    pkgs.copyPathToStore ./lynx.lss;
+}
diff --git a/modules/shell/lynx/lynx.cfg b/modules/shell/lynx/lynx.cfg
new file mode 100644
index 000000000000..3359b95ce9af
--- /dev/null
+++ b/modules/shell/lynx/lynx.cfg
@@ -0,0 +1,17 @@
+STARTFILE:https://search.weho.st/
+DEFAULT_INDEX_FILE:https://search.weho.st/
+SAVE_SPACE:/tmp
+URL_DOMAIN_PREFIXES:
+URL_DOMAIN_SUFFIXES:
+SHOW_CURSOR:TRUE
+UNDERLINE_LINKS:TRUE
+SOURCE_CACHE:MEMORY
+FORCE_SSL_COOKIES_SECURE:TRUE
+SYSTEM_MAIL:neomutt
+VI_KEYS_ALWAYS_ON:TRUE
+DEFAULT_KEYPAD_MODE:LINKS_AND_FIELDS_ARE_NUMBERED
+MAKE_LINKS_FOR_ALL_IMAGES:TRUE
+XLOADIMAGE_COMMAND:imv %s &
+EXTERNAL:mailto:neomutt %s:TRUE:TRUE
+TEXTFIELDS_NEED_ACTIVATION:TRUE
+CHARACTER_SET:utf-8
diff --git a/modules/shell/lynx/lynx.lss b/modules/shell/lynx/lynx.lss
new file mode 100644
index 000000000000..cf0d3265e00c
--- /dev/null
+++ b/modules/shell/lynx/lynx.lss
@@ -0,0 +1,105 @@
+# Normal type styles correspond to HTML tags.
+#
+# The next line (beginning with "em") means:  use bold if mono, otherwise
+# brightblue on <defaultbackground>
+em:		bold:			brightblue
+strong:		bold:			brightred
+b:		bold:			red
+i:		bold:			brightblue
+a:		bold:			green
+img:		dim:			brown
+fig:		normal:			gray
+caption:	reverse:		brown
+hr:		normal:			yellow
+blockquote:	normal:			brightblue
+ul:		normal:			brown
+address:	normal:			magenta
+title:		normal:			magenta
+tt:		dim:			brightmagenta:	black
+h1:		bold:			yellow:		blue
+label:		normal:			magenta
+q:		normal:			yellow:		magenta
+small:		dim:			default
+big:		bold:			yellow
+sup:		bold:			yellow
+sub:		dim:			gray
+li:		normal:			magenta
+code:		normal:			cyan
+cite:		normal:			cyan
+
+table:		normal:			brightcyan
+tr:		bold:			brown
+td:		normal:			default
+br:		normal:			default
+
+# Special styles - not corresponding directly to HTML tags
+#	alert	- status bar, when message begins "Alert".
+#	alink	- active link
+#	normal	- default attributes
+#	status	- status bar
+#	whereis	- whereis search target
+#
+#normal:normal:default:blue
+alink:		reverse:		yellow:		black
+status:		reverse:		yellow:		blue
+alert:		bold:			yellow:		red
+whereis:	reverse+underline:	magenta:	cyan
+# currently not used
+#value:normal:green
+
+menu.bg:	normal:			black:		lightgray
+menu.frame:	normal:			black:		lightgray
+menu.entry:	normal:			lightgray:	black
+menu.n:		normal:			red:		gray
+menu.active:	normal:			yellow:		black
+menu.sb:	normal:			brightred:	lightgray
+
+forwbackw.arrow:reverse
+hot.paste:	normal:			brightred:	gray
+
+# Styles with classes - <ul class=red> etc.
+ul.red:		underline:		brightred
+ul.blue:	bold:			brightblue
+li.red:		reverse:		red:		yellow
+li.blue:	bold:			blue
+strong.a:	bold:			black:		red
+em.a:		reverse:		black:		blue
+strong.b:	bold:			white:		red
+em.b:		reverse:		white:		blue
+strong.debug:	reverse:		green
+font.letter:	normal:			white:		blue
+input.submit:	normal:			cyan
+tr.baone:	bold:			yellow
+tr.batwo:	bold:			green
+tr.bathree:	bold:			red
+#
+# Special handling for link.
+link:		normal:			white
+link.green:	bold:			brightgreen
+link.red:	bold:			black:		red
+link.blue:	bold:			white:		blue
+link.toc:	bold:			black:		white
+# Special cases for link - the rel or title is appended after the class.
+# <link rel=next class=red href="1">
+link.red.next:	bold:			red
+link.red.prev:	bold:			yellow:		red
+link.blue.prev:	bold:			yellow:		blue
+link.blue.next:	bold:			blue
+link.green.toc:	bold:			white:		green
+#
+# Define styles that will be used when syntax highlighting is requested
+# (commandline option -prettysrc).
+span.htmlsrc_comment:normal:		white
+span.htmlsrc_tag:normal:		white
+#If you don't like that the tag name and attribute name are displayed
+#in different colors, comment the following line.
+span.htmlsrc_attrib:normal:		cyan
+span.htmlsrc_attrval:normal:		magenta
+span.htmlsrc_abracket:normal:		white
+span.htmlsrc_entity:normal:		white
+##span.htmlsrc_href:
+##span.htmlsrc_entire:
+span.htmlsrc_badseq:normal:		red
+span.htmlsrc_badtag:normal:		red
+span.htmlsrc_badattr:normal:		red
+span.htmlsrc_sgmlspecial:normal:	yellow
diff --git a/modules/shell/tmux/config.nix b/modules/shell/tmux/config.nix
new file mode 100644
index 000000000000..d62a472bc1d8
--- /dev/null
+++ b/modules/shell/tmux/config.nix
@@ -0,0 +1,90 @@
+{ stdenv, writeText, writeShellScriptBin
+, coreutils, extract_url, reattach-to-user-namespace, ruby, tmux, zsh }:
+
+''
+set -gw activity-action none
+set -g  allow-rename off
+set -g  base-index 1
+${if stdenv.isDarwin then ''
+  set -g default-command "${reattach-to-user-namespace}/bin/reattach-to-user-namespace -l ${zsh}/bin/zsh"
+'' else ''
+  set -g default-command "${zsh}/bin/zsh -l"
+''}
+set -gs default-terminal screen-256color
+set -s  escape-time 0
+set -gw mode-keys vi
+set -gw monitor-activity on
+set -g  mouse on
+set -gw pane-active-border-style fg=default,bright
+set -gw pane-base-index 1
+set -gw pane-border-format ' #{pane_current_command} '
+set -gw pane-border-status top
+set -g  prefix C-a
+set -g  renumber-windows on
+set -g  status-left ""
+set -g  status-position top
+set -g  status-right ""
+set -ga status-right " #{?client_prefix, #[bright]#{prefix}#[nobright] ,}"
+# set -ga status-right ' #(cd #{pane_current_path} && zsh -c "print -P %%~") '
+# set -ga status-right '#(head="$(git -C #{pane_current_path} rev-parse --abbrev-ref HEAD 2>/dev/null)" && echo " $head ")'
+# set -ga status-right ' #(pmset -g batt | grep -o \\d*%%) '
+set -ga status-right " %d-%b-%y %H:%M"
+set -g  status-right-length 200
+set -g  status-style bg=default,fg=default
+set -gw window-status-style fg=default
+set -gw window-status-activity-style fg=default,underscore
+set -gw window-status-bell-style fg=brightcyan
+set -gw window-status-current-format '#W'
+set -gw window-status-current-style bright
+set -gw window-status-format '#W'
+set -gw window-status-separator '  '
+
+bind -n   F1  select-window -t :1
+bind -n   F2  select-window -t :2
+bind -n   F3  select-window -t :3
+bind -n   F4  select-window -t :4
+bind -n   F5  select-window -t :5
+bind -n   F6  select-window -t :6
+bind -n   F7  select-window -t :7
+bind -n   F8  select-window -t :8
+bind -n   F9  select-window -t :9
+bind -n   F10 select-window -t :10
+bind -n   F11 select-window -t :11
+bind -n   F12 select-window -t :12
+bind -n S-F1  select-window -t :13
+bind -n S-F2  select-window -t :14
+bind -n S-F3  select-window -t :15
+bind -n S-F4  select-window -t :16
+bind -n S-F5  select-window -t :17
+bind -n S-F6  select-window -t :18
+bind -n S-F7  select-window -t :19
+bind -n S-F8  select-window -t :20
+
+bind -n C-l send-keys C-l \; run-shell "sleep 0.3" \; clear-history
+bind    C-l send-keys -R \; clear-history
+
+bind '"' split-window -v -c '#{pane_current_path}'
+bind  %  split-window -h -c '#{pane_current_path}'
+
+bind C-a send-prefix
+
+unbind C-b
+
+set-hook -g after-select-pane "refresh-client -S"
+set-hook -g alert-activity "refresh-client -S"
+
+bind u run ${writeShellScriptBin "tmux-url" ''
+set -ue
+buffer="$(mktemp -t tmux-buffer)"
+open=${writeText "tmux-open-url.rb" ''
+#!${ruby}/bin/ruby
+require "cgi"
+exec "/usr/bin/open", CGI.unescape(ARGV[0]), *ARGV[1..-1]
+''}
+${tmux}/bin/tmux capture-pane -J
+${tmux}/bin/tmux save-buffer "$buffer"
+${tmux}/bin/tmux split-window -l 10 -f "${coreutils}/bin/tac $buffer | BROWSER=\"$open\"i ${extract_url}/bin/extract_url"
+''}/bin/tmux-url
+
+# bind u run "~/.config/tmux/url.sh"
+''
diff --git a/modules/shell/tmux/default.nix b/modules/shell/tmux/default.nix
new file mode 100644
index 000000000000..469e53f89d01
--- /dev/null
+++ b/modules/shell/tmux/default.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+
+{
+  xdg.config.users.qyliss.paths."tmux.conf" =
+    with pkgs; writeText "tmux.conf" (callPackage ./config.nix { });
+
+  environment.systemPackages = with pkgs; [ tmux ];
+}
diff --git a/modules/shell/zsh/default.nix b/modules/shell/zsh/default.nix
new file mode 100644
index 000000000000..d151e1434eca
--- /dev/null
+++ b/modules/shell/zsh/default.nix
@@ -0,0 +1,22 @@
+{ pkgs, config, ... }:
+
+{
+  environment.etc.zshrc.text = ''
+    unsetopt GLOBAL_RCS
+
+    if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then
+        . ${config.system.build.setEnvironment}
+    fi
+  '';
+
+  environment.extraInit = ''
+    export ZDOTDIR="/etc/xdg/nixos/per-user/$USER/zsh"
+  '';
+
+  home.qyliss.dirs."state/zsh" = {};
+
+  xdg.config.users.qyliss.paths."zsh/.zshrc" =
+    with pkgs; writeText "zshrc" (callPackage ./zshrc.nix {});
+
+  environment.systemPackages = with pkgs; [ zsh nix-zsh-completions ];
+}
diff --git a/modules/shell/zsh/zshrc.nix b/modules/shell/zsh/zshrc.nix
new file mode 100644
index 000000000000..80127da75407
--- /dev/null
+++ b/modules/shell/zsh/zshrc.nix
@@ -0,0 +1,206 @@
+{ stdenv, lib
+, any-nix-shell
+, coreutils
+, zsh-autosuggestions
+, zsh-history-substring-search
+, zsh-syntax-highlighting
+}:
+
+let
+  options = {
+    # Completion
+    always_to_end = true;
+    auto_name_dirs = true;
+    complete_in_word = true;
+    list_packed = true;
+
+    # Expansion and Globbing
+    bad_pattern = true;
+    brace_ccl = true;
+    extended_glob = true;
+    equals = true;
+    glob_star_short = true;
+    magic_equal_subst = true;
+    rc_expand_param = true;
+    rematch_pcre = true;
+
+    # Input/Output
+    correct = true;
+    mail_warning = true;
+    rc_quotes = true;
+    rm_star_wait = true;
+    short_loops = true;
+
+    # History
+    share_history = true;
+    bang_hist = true;
+    hist_allow_clobber = true;
+    hist_beep = true;
+    hist_expire_dups_first = true;
+    hist_ignore_dups = true;
+    hist_ignore_space = true;
+    hist_no_store = true;
+    hist_reduce_blanks = true;
+
+    # Prompting
+    prompt_sp = true;
+
+    # Scripts and Functions
+    c_bases = true;
+    c_precedences = true;
+    octal_zeroes = true;
+  };
+
+  enabledOptions = lib.attrNames (lib.filterAttrs (_: lib.id) options);
+  disabledOptions = lib.attrNames (lib.filterAttrs (_: v: !v) options);
+
+in ''
+
+. ${<nixpkgs/nixos/modules/programs/zsh/zinputrc>}
+
+# Disable silver searcher numbers when piped or redirected.
+ag() {
+    if ! [ -t 1 ]; then
+        command ag --no-numbers "$@"
+    else
+        command ag "$@"
+    fi
+}
+
+fzf_ctrl_t() {
+    if git rev-parse >/dev/null 2>&1; then
+        git ls-files -co --exclude-standard
+    else
+        find . -type f | sed 's/^\.\///g'
+    fi
+}
+
+HISTFILE=~/state/zsh/history
+HISTSIZE=10000
+REPORTTIME=5
+SAVEHIST=9000
+ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets)
+
+${lib.optionalString (enabledOptions == [])
+    "setopt ${lib.concatStringsSep " " enabledOptions}"}
+
+${lib.optionalString (disabledOptions == [])
+    "unsetopt ${lib.concatStringsSep " " enabledOptions}"}
+
+autoload -Uz colors && colors
+
+zstyle ':completion::complete:*' use-cache on
+zstyle ':completion::complete:*' cache-path "$XDG_CACHE_DIR/zsh/zcompcache"
+zstyle ':completion:*' auto-description '%d'
+zstyle ':completion:*' completer _expand _complete _ignored _match _correct \
+                                             _approximate _prefix
+zstyle ':completion:*' expand suffix
+zstyle ':completion:*' group-name '''
+zstyle ':completion:*' insert-unambiguous true
+zstyle ':completion:*' list-colors '''
+zstyle ':completion:*' list-suffixes true
+zstyle ':completion:*' matcher-list \
+    'm:{[:lower:]}={[:upper:]}' 'm:{[:lower:][:upper:]}={[:upper:][:lower:]}' \
+    'r:|[._-/]=* r:|=*' 'l:|=* r:|=*'
+zstyle ':completion:*' menu select=1
+zstyle ':completion:*' original false
+zstyle ':completion:*' preserve-prefix '//[^/]##/'
+zstyle ':completion:*' select-prompt \
+    %SScrolling active: current selection at %p%s
+zstyle ':completion:*' squeeze-slashes true
+zstyle ':completion:*' use-compctl true
+zstyle ':completion:*' verbose true
+
+autoload -U url-quote-magic
+zle -N self-insert url-quote-magic
+
+autoload -Uz compinit
+compinit -d "$XDG_CACHE_HOME/zsh/zcompdump"
+
+eval "$(${any-nix-shell}/bin/any-nix-shell zsh --info-right)"
+source ${zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+source ${zsh-history-substring-search}/share/zsh-history-substring-search/zsh-history-substring-search.zsh
+source ${zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh
+
+zmodload zsh/complist
+bindkey -M menuselect "^[[Z" reverse-menu-complete
+
+zmodload zsh/terminfo
+bindkey "^[[A" history-substring-search-up
+bindkey "^[[B" history-substring-search-down
+
+bindkey "^[[3~" delete-char
+bindkey "^[[F" end-of-line
+bindkey "^[[H" beginning-of-line
+bindkey "^[[1~" beginning-of-line
+bindkey "^[[4~" end-of-line
+bindkey "^[^[[C" forward-word
+bindkey "^[^[[D" backward-word
+
+if [ -n "$TMUX" ]; then
+    tmux-page-up() { tmux copy-mode -ue }
+    tmux-page-down() { tmux send-keys -X page-down 2>/dev/null }
+    zle -N tmux-page-up
+    zle -N tmux-page-down
+    bindkey "^[[5~" tmux-page-up
+    bindkey "^[[6~" tmux-page-down
+fi
+
+autoload -U edit-command-line
+zle -N edit-command-line
+bindkey "^x^e" edit-command-line
+
+if [[ -v TMUX ]]; then
+    _tmux_hook() {
+        local exit_status="$?"
+        tmux set-environment "last_exit_status_$(tmux display-message -p '#D')" "$exit_status"
+        tmux refresh-client -S
+    }
+
+    typeset -ag precmd_functions;
+    if [[ -z $${precmd_functions[(r)_tmux_hook]} ]]; then
+        precmd_functions+=_tmux_hook;
+    fi
+fi
+
+${lib.optionalString stdenv.isDarwin ''
+    # Load SSH passphrases from the Keychain.
+    # Use an explicit path because upstream OpenSSH
+    # doesn't have the keychain functionality.
+    (/usr/bin/ssh-add -A &) 2> /dev/null
+''}
+
+if command -v fzf-share >/dev/null; then
+    source "$(fzf-share)/key-bindings.zsh"
+fi
+
+# Aliases
+alias beep='printf "\a"'
+alias ls=${lib.escapeShellArg (if stdenv.isDarwin then
+                                 "/bin/ls -AFh"
+                               else
+                                 "${coreutils}/bin/ls -AF --si --color=auto")}
+alias tree='tree -aRF -I .git'
+alias vim=nvim
+
+for command in cargo curl dig find git mutt ri wget; do
+    alias "$command=noglob $command"
+done
+
+# Prompt
+nl=$'\n'
+PS1="%F{yellow}%1(j.&%j .)%f%# "
+
+preexec() {
+    show_exit=1
+}
+
+precmd() {
+    ex="$?"
+    if [[ -n "$show_exit" && "$ex" -ne 0 ]]
+    then echo -e "\r\e[33m[exit $ex]\e[0m"
+    fi
+    unset show_exit
+}
+
+''
diff --git a/modules/ssh/default.nix b/modules/ssh/default.nix
new file mode 100644
index 000000000000..322a02fde946
--- /dev/null
+++ b/modules/ssh/default.nix
@@ -0,0 +1,43 @@
+{ pkgs, ... }:
+
+{
+  programs.ssh.extraConfig = ''
+    Host uhura spock
+      HostName %h.edef.eu
+
+    Host hyperion
+      HostName %h.kookie.space
+
+    Host atuin
+      HostName %h.qyliss.net
+
+    Match host github.com
+      User git
+  '';
+
+  programs.ssh.knownHosts = [
+    {
+      hostNames = [ "github.com" ];
+      publicKey = ''
+        ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
+      '';
+    }
+
+    {
+      hostNames = [ "@cert-authority edef.eu,*.edef.eu" ];
+      publicKeyFile = with pkgs; runCommand "edef.eu" {
+        nativeBuildInputs = [ curl gnupg ];
+        outputHashAlgo = "sha256";
+        outputHashMode = "recursive";
+        outputHash = "1n3136v4yl5w5g2dg874v3sk8a6a3346hrhk8an6kmm2zc6z2j1v";
+      } ''
+        set -ueo pipefail
+        export GNUPGHOME="$PWD/gnupg"
+        mkdir -m 0700 "$GNUPGHOME"
+        curl -fL --cacert ${cacert}/etc/ssl/certs/ca-bundle.crt \
+            https://edef.eu/edef.asc | gpg --import
+        gpg --output $out --export-ssh-key '87FC9CBBD39FB2B36EE3D86994D3730D803010E7!'
+      '';
+    }
+  ];
+}
diff --git a/modules/users/default.nix b/modules/users/default.nix
new file mode 100644
index 000000000000..261b269a392d
--- /dev/null
+++ b/modules/users/default.nix
@@ -0,0 +1,32 @@
+{ pkgs, lib, ... }:
+
+let
+  # These defaults should override the NixOS defaults,
+  # but still themselves be overridable at the default priority.
+  mkDefault = lib.mkOverride 999;
+
+in {
+  imports = [ ../home ];
+
+  users.mutableUsers = false;
+  users.groups.qyliss = {};
+  users.users.qyliss = {
+    createHome = true;
+    description = "Alyssa Ross";
+    home = mkDefault "/home";
+    uid = mkDefault 1000;
+    subUidRanges = [ { count = 65536; startUid = 100000; } ];
+    subGidRanges = [ { count = 65536; startGid = 100000; } ];
+    group = "qyliss";
+    extraGroups = [ "wheel" "networkmanager" ];
+    shell = pkgs.zsh;
+  };
+
+  home.qyliss = {
+    permissions = "0550";
+    group = "qyliss";
+  };
+  home.qyliss.dirs.state = {
+    permissions = "0500";
+  };
+}
diff --git a/modules/workstation/default.nix b/modules/workstation/default.nix
new file mode 100644
index 000000000000..ab38b9a770f6
--- /dev/null
+++ b/modules/workstation/default.nix
@@ -0,0 +1,14 @@
+{ lib, pkgs, ... }:
+
+{
+  imports = [
+    ../nix ../locale ../shell ../users ../ssh
+    ./windowing ./fonts ./hardware
+    ./dict ./gnupg ./mail ./podman ./weechat
+  ];
+
+  environment.systemPackages = with pkgs; [ man-pages mosh ];
+
+  services.mingetty.autologinUser = "qyliss";
+  services.mingetty.loginOptions = "-- \u";
+}
diff --git a/modules/workstation/dict/default.nix b/modules/workstation/dict/default.nix
new file mode 100644
index 000000000000..c21e20e947a4
--- /dev/null
+++ b/modules/workstation/dict/default.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+
+{
+  services.dictd.enable = true;
+  services.dictd.DBs = with pkgs.dictdDBs; [ epo2eng ];
+}
diff --git a/modules/workstation/fonts/default.nix b/modules/workstation/fonts/default.nix
new file mode 100644
index 000000000000..b400203092f8
--- /dev/null
+++ b/modules/workstation/fonts/default.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+
+{
+  fonts.fonts = with pkgs; [ iosevka twemoji-color-font noto-fonts-cjk ];
+  fonts.fontconfig.defaultFonts.monospace = [ "Iosevka" ];
+}
diff --git a/modules/workstation/gnupg/default.nix b/modules/workstation/gnupg/default.nix
new file mode 100644
index 000000000000..ca59c18bed2c
--- /dev/null
+++ b/modules/workstation/gnupg/default.nix
@@ -0,0 +1,20 @@
+{ pkgs, ... }:
+
+{
+  home.qyliss.dirs."state/gnupg".activationScripts.config =
+    let
+      gpg-agent-conf = with pkgs;
+        writeText "gpg-agent.conf" (callPackage ./gpg-agent.conf.nix {});
+    in ''
+      ln -sf ${./dirmngr.conf} dirmngr.conf
+      ln -sf ${./gpg.conf} gpg.conf
+      ln -sf ${gpg-agent-conf} gpg-agent.conf
+    '';
+
+  environment.systemPackages = with pkgs; [ gnupg ];
+
+  environment.extraInit = ''
+    export GNUPGHOME="$HOME/state/gnupg"
+    export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
+  '';
+}
diff --git a/modules/workstation/gnupg/dirmngr.conf b/modules/workstation/gnupg/dirmngr.conf
new file mode 100644
index 000000000000..9b7105671236
--- /dev/null
+++ b/modules/workstation/gnupg/dirmngr.conf
@@ -0,0 +1 @@
+keyserver hkps://keyserver.ubuntu.com
diff --git a/modules/workstation/gnupg/gpg-agent.conf.nix b/modules/workstation/gnupg/gpg-agent.conf.nix
new file mode 100644
index 000000000000..36b2f196bfa4
--- /dev/null
+++ b/modules/workstation/gnupg/gpg-agent.conf.nix
@@ -0,0 +1,9 @@
+{ stdenv, lib, pinentry_mac }:
+
+''
+${lib.optionalString stdenv.isDarwin ''
+  pinentry-program ${lib.concatStringsSep "/"
+    [ pinentry_mac "Applications" "pinentry-mac.app" "Contents" "MacOS"
+      "pinentry-mac" ]}
+''}
+''
diff --git a/modules/workstation/gnupg/gpg.conf b/modules/workstation/gnupg/gpg.conf
new file mode 100644
index 000000000000..ec69a24559bb
--- /dev/null
+++ b/modules/workstation/gnupg/gpg.conf
@@ -0,0 +1,2 @@
+auto-key-retrieve
+ask-cert-level
diff --git a/modules/workstation/hardware/default.nix b/modules/workstation/hardware/default.nix
new file mode 100644
index 000000000000..dfb9d6c1b7c5
--- /dev/null
+++ b/modules/workstation/hardware/default.nix
@@ -0,0 +1,7 @@
+{ ... }:
+
+{
+  imports = [ ./keyboard ./yubikey ];
+
+  sound.enable = true;
+}
diff --git a/modules/workstation/hardware/keyboard/MAPPINGS b/modules/workstation/hardware/keyboard/MAPPINGS
new file mode 100644
index 000000000000..60ded39c8cf1
--- /dev/null
+++ b/modules/workstation/hardware/keyboard/MAPPINGS
@@ -0,0 +1,7 @@
+Key remappings are spread across several different places, because they
+have to be done differently depending on the remapping.
+
+Here is an overview of remapped keys:
+
+Caps Lock: Escape if pressed, Ctrl if held
+Tab: Super-L if pressed, Tab if held
diff --git a/modules/workstation/hardware/keyboard/default.nix b/modules/workstation/hardware/keyboard/default.nix
new file mode 100644
index 000000000000..d2b13640277c
--- /dev/null
+++ b/modules/workstation/hardware/keyboard/default.nix
@@ -0,0 +1,22 @@
+{ pkgs, config, ... }:
+
+let
+  xcfg = config.services.xserver;
+
+in
+{
+  i18n.consoleUseXkbConfig = true;
+  services.xserver.layout = "dvorak";
+  services.xserver.xkbOptions = "ctrl:nocaps,compose:menu";
+
+  environment.variables.XKB_DEFAULT_LAYOUT = xcfg.layout;
+  environment.variables.XKB_DEFAULT_OPTIONS = xcfg.xkbOptions;
+
+  services.evscript.enable = true;
+  services.evscript.script = ./events.dyon;
+
+  boot.postBootCommands = ''
+    # Remap tab to left super
+    /run/current-system/sw/bin/setkeycodes 0f 125
+  '';
+}
diff --git a/modules/workstation/hardware/keyboard/events.dyon b/modules/workstation/hardware/keyboard/events.dyon
new file mode 100644
index 000000000000..96cc15450e46
--- /dev/null
+++ b/modules/workstation/hardware/keyboard/events.dyon
@@ -0,0 +1,14 @@
+//! [events]
+//! keys = ['ESC', 'TAB']
+fn main() ~ evdevs, uinput {
+    should_esc := false
+    should_tab := false
+    loop {
+        evts := next_events(evdevs)
+        for i {
+            evt := evts[i]
+            xcape(mut should_esc, evt, KEY_CAPSLOCK(), [KEY_ESC()])
+            xcape(mut should_tab, evt, KEY_LEFTMETA(), [KEY_TAB()])
+        }
+    }
+}
diff --git a/modules/workstation/hardware/yubikey/default.nix b/modules/workstation/hardware/yubikey/default.nix
new file mode 100644
index 000000000000..d047246bb20d
--- /dev/null
+++ b/modules/workstation/hardware/yubikey/default.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+
+{
+  services.udev.packages = with pkgs; [ yubikey-personalization ];
+
+  security.pam.services.sudo.u2fAuth = true;
+  security.sudo.extraConfig = ''
+    Defaults timestamp_timeout=0
+  '';
+
+  security.pam.u2f.cue = true;
+  security.pam.u2f.authFile = pkgs.copyPathToStore ./u2f_keys;
+}
diff --git a/modules/workstation/hardware/yubikey/u2f_keys b/modules/workstation/hardware/yubikey/u2f_keys
new file mode 100644
index 000000000000..c5601f5f0703
--- /dev/null
+++ b/modules/workstation/hardware/yubikey/u2f_keys
@@ -0,0 +1 @@
+qyliss:HIWnn91xwo-f14WjdDSdiX2Rs9NdJr2QF4_5_gYUpTkennbpR8AOXHmfEzj5llyLyb-_WEaVUQU59ieCamq9SA,044196971044cff2724ea9ab4624ef860fde32337acc6c3a323899f36a50bf87d06f535c146111f96925455f8c07addff769dfd502c216a9683c70898bb521ada5
diff --git a/modules/workstation/mail/default.nix b/modules/workstation/mail/default.nix
new file mode 100644
index 000000000000..75b471fd626a
--- /dev/null
+++ b/modules/workstation/mail/default.nix
@@ -0,0 +1,16 @@
+{ pkgs, ... }:
+
+{
+  imports = [ ./isync ./msmtp ./mutt ];
+
+  users.users.qyliss-mail = {
+    home = "/var/home/qyliss-mail";
+    group = "qyliss";
+    createHome = true;
+  };
+
+  home.qyliss.dirs.mail = {
+    group = "qyliss";
+    permissions = "0770";
+  };
+}
diff --git a/modules/workstation/mail/isync/default.nix b/modules/workstation/mail/isync/default.nix
new file mode 100644
index 000000000000..da7a332e927d
--- /dev/null
+++ b/modules/workstation/mail/isync/default.nix
@@ -0,0 +1,39 @@
+{ pkgs, config, ... }:
+
+
+{
+  environment.systemPackages = with pkgs; [ isync ];
+
+  systemd.services.isync =
+    let
+      maildir = "${config.users.users.qyliss.home}/mail";
+      mbsyncrc = pkgs.writeText "mbsyncrc"
+                                (import ./mbsyncrc.nix { inherit maildir; });
+    in with pkgs; {
+      serviceConfig.Type = "oneshot";
+      script = ''
+        ${sudo}/bin/sudo -u qyliss-mail \
+        ${isync}/bin/mbsync -a -c ${mbsyncrc}
+      '';
+      postStart = ''
+        ${findutils}/bin/find \
+            "${maildir}" \
+            -not -name .mbsyncstate* \
+            -exec ${coreutils}/bin/chown qyliss:qyliss '{}' \; \
+            \( \
+              -type f \
+              -exec ${coreutils}/bin/chmod 0660 '{}' \; \
+            -or \
+              -type d \
+              -exec ${coreutils}/bin/chmod 0770 '{}' \; \
+            \)
+      '';
+    };
+
+  systemd.timers.isync = {
+    timerConfig.Unit = "isync.service";
+    timerConfig.OnCalendar = "*:0/5";
+    timerConfig.Persistent = "true";
+    after = [ "networking.target" ];
+  };
+}
diff --git a/modules/workstation/mail/isync/mbsyncrc.nix b/modules/workstation/mail/isync/mbsyncrc.nix
new file mode 100644
index 000000000000..3a093e35efb5
--- /dev/null
+++ b/modules/workstation/mail/isync/mbsyncrc.nix
@@ -0,0 +1,26 @@
+{ maildir }:
+
+''
+Create Both
+
+MaildirStore local
+  Path ${maildir}/
+  Inbox ${maildir}/INBOX
+  Subfolders Verbatim
+
+IMAPAccount fastmail
+  Host imap.fastmail.com
+  User alyssa@fastmail.com
+  PassCmd "cat ~/imappass"
+  SSLType IMAPS
+  SSLVersions TLSv1.2
+
+IMAPStore fastmail-remote
+  Account fastmail
+
+Channel fastmail
+  Master :fastmail-remote:
+  Slave :local:
+  Patterns *
+  SyncState *
+''
diff --git a/modules/workstation/mail/msmtp/default.nix b/modules/workstation/mail/msmtp/default.nix
new file mode 100644
index 000000000000..34e23b1d1eb0
--- /dev/null
+++ b/modules/workstation/mail/msmtp/default.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [ msmtp ];
+
+  home.qyliss.dirs."state/msmtp" = {};
+
+  xdg.config.users.qyliss.paths."msmtp/config" = pkgs.substituteAll {
+    src = ./msmtprc.in;
+    inherit (pkgs) gnupg;
+    tls_trust_file = "/etc/ssl/certs/ca-bundle.crt";
+  };
+}
diff --git a/modules/workstation/mail/msmtp/msmtprc.in b/modules/workstation/mail/msmtp/msmtprc.in
new file mode 100644
index 000000000000..ac5da47372f0
--- /dev/null
+++ b/modules/workstation/mail/msmtp/msmtprc.in
@@ -0,0 +1,20 @@
+defaults
+auth on
+tls on
+tls_trust_file @tls_trust_file@
+
+account work
+host smtp.gmail.com
+port 587
+from alyssa.ross@freeagent.com
+user alyssa.ross@freeagent.com
+
+account personal
+host smtp.fastmail.com
+port 465
+tls_starttls off
+from hi@alyssa.is
+user alyssa@fastmail.com
+passwordeval @gnupg@/bin/gpg --no-tty -q -d ~/state/msmtp/smtppass.gpg
+
+account default : personal
diff --git a/modules/workstation/mail/mutt/default.nix b/modules/workstation/mail/mutt/default.nix
new file mode 100644
index 000000000000..bb0d8bbbf6b0
--- /dev/null
+++ b/modules/workstation/mail/mutt/default.nix
@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [ neomutt ];
+
+  xdg.config.users.qyliss.paths."mutt/muttrc" = pkgs.copyPathToStore ./muttrc;
+
+  home.qyliss.dirs."state/mutt/header_cache" = {};
+}
diff --git a/modules/workstation/mail/mutt/muttrc b/modules/workstation/mail/mutt/muttrc
new file mode 100644
index 000000000000..c40ff19fe5aa
--- /dev/null
+++ b/modules/workstation/mail/mutt/muttrc
@@ -0,0 +1,54 @@
+color index red default ~P
+
+unignore List-Id:
+ignore User-Agent:
+
+set beep = no
+set beep_new = yes
+set edit_headers = yes
+set fast_reply = yes
+set folder = ~/mail
+set header_cache = ~/state/mutt/header_cache
+set help = no
+set mark_old = no
+set mime_forward = ask-no
+set pager = "less -+S"
+set quit = ask-yes
+set sort = threads
+set sort_browser = new
+set user_agent = no
+
+unset prompt_after
+
+set spoolfile = +INBOX
+
+# set record = "=[Gmail]/Sent Mail"
+# set postponed = "=[Gmail]/Drafts"
+mailboxes =INBOX =Flats =Indirect =Roles =Services =Lists =Lists/GitHub =Lists/rust-users =Lists/libtool =Lists/Bugzilla =Lists/hacklab-members =Lists/edinburgh-ath =Lists/cgit =Drafts =Sent =Archive =Archive/Receipts =Trash =Spam
+set record = "=Sent"
+set trash = "=Archive"
+set postponed = "=Drafts"
+set sendmail = "msmtp"
+
+set pgp_use_gpg_agent = yes
+set crypt_autosign = yes
+set crypt_opportunistic_encrypt = yes
+set postpone_encrypt = yes
+
+# Required for postpone_encrypt to work
+set pgp_default_key = 757356D779BBB888773E415E736CCDF9EF51BD97
+
+set pgp_decode_command       = "gpg --status-fd=2 %?p?--pinentry-mode loopback --passphrase-fd 0? --no-verbose --quiet --batch --output - %f"
+set pgp_verify_command       = "gpg --status-fd=2 --no-verbose --quiet --batch --output - --verify %s %f"
+set pgp_decrypt_command      = "gpg --status-fd=2 %?p?--pinentry-mode loopback --passphrase-fd 0? --no-verbose --quiet --batch --output - --decrypt %f"
+set pgp_sign_command         = "gpg %?p?--pinentry-mode loopback --passphrase-fd 0? --no-verbose --batch --quiet --output - --armor --textmode %?a?--local-user %a? --detach-sign %f"
+set pgp_clearsign_command    = "gpg %?p?--pinentry-mode loopback --passphrase-fd 0? --no-verbose --batch --quiet --output - --armor --textmode %?a?--local-user %a? --clearsign %f"
+set pgp_encrypt_only_command = "pgpewrap gpg --trust-model always --batch --quiet --no-verbose --output - --textmode --armor --encrypt -- --recipient %r -- %f"
+set pgp_encrypt_sign_command = "pgpewrap gpg %?p?--pinentry-mode loopback --passphrase-fd 0? --trust-model always --batch --quiet --no-verbose --textmode --output - %?a?--local-user %a? --armor --sign --encrypt -- --recipient %r -- %f"
+set pgp_import_command       = "gpg --no-verbose --import %f"
+set pgp_export_command       = "gpg --no-verbose --armor --export %r"
+set pgp_verify_key_command   = "gpg --verbose --batch --fingerprint --check-sigs %r"
+set pgp_list_pubring_command = "gpg --no-verbose --batch --quiet --with-colons --with-fingerprint --with-fingerprint --list-keys %r"
+set pgp_list_secring_command = "gpg --no-verbose --batch --quiet --with-colons --with-fingerprint --with-fingerprint --list-secret-keys %r"
+set pgp_good_sign            = "^\\[GNUPG:\\] GOODSIG
+set pgp_decryption_okay      = "^\\[GNUPG:\\] DECRYPTION_OKAY"
diff --git a/modules/workstation/networking/default.nix b/modules/workstation/networking/default.nix
new file mode 100644
index 000000000000..4f3854b7fad7
--- /dev/null
+++ b/modules/workstation/networking/default.nix
@@ -0,0 +1,44 @@
+{ pkgs, config, ... }:
+
+{
+  services.resolved.enable = true;
+
+  networking.domain = "qyliss.net";
+  networking.hosts = with config.networking;
+    { "127.0.1.1" = [ "${hostName}.${domain}" ]; };
+
+  networking.networkmanager.enable = true;
+
+  # Plausible MAC randomization
+  networking.networkmanager.ethernet.macAddress = "random";
+  networking.networkmanager.wifi.macAddress = "random";
+  networking.networkmanager.extraConfig = ''
+    [connection-extra]
+    ethernet.generate-mac-address-mask=FE:FF:FF:00:00:00
+    wifi.generate-mac-address-mask=FE:FF:FF:00:00:00
+  '';
+
+  networking.nameservers = [ "::1" ];
+
+  networking.networkmanager.dispatcherScripts = [
+    {
+      source = pkgs.writeText "doh-stub" ''
+        if [ "$2" = up ]
+        then systemctl restart doh-stub.service
+        fi
+      '';
+      type = "basic";
+    }
+  ];
+
+  systemd.services.doh-stub = {
+    script = ''
+      exec ${pkgs.doh-proxy}/bin/doh-stub \
+          --level INFO \
+          --domain qyliss.net \
+          --remote-address 85.119.82.108
+    '';
+  };
+
+  programs.mtr.enable = true;
+}
diff --git a/modules/workstation/physical/default.nix b/modules/workstation/physical/default.nix
new file mode 100644
index 000000000000..173dbbbb517f
--- /dev/null
+++ b/modules/workstation/physical/default.nix
@@ -0,0 +1,7 @@
+{ ... }:
+
+{
+  imports = [ ../. ../networking ];
+
+  programs.swayidle.enable = true;
+}
diff --git a/modules/workstation/podman/default.nix b/modules/workstation/podman/default.nix
new file mode 100644
index 000000000000..491c3786cfd0
--- /dev/null
+++ b/modules/workstation/podman/default.nix
@@ -0,0 +1,43 @@
+{ pkgs, ... }:
+
+{
+  environment.etc."containers/libpod.conf".text = ''
+    runtime_path = ["${pkgs.runc}/bin/runc"]
+    conmon_path = ["${pkgs.conmon}/bin/conmon"]
+  '';
+
+  environment.etc."containers/policy.json".text = builtins.toJSON {
+    # Not insecure when I'm manually pulling images on a workstation.
+    default = [ { type = "insecureAcceptAnything"; } ];
+  };
+
+  environment.etc."containers/registries.conf".text = ''
+    [registries.search]
+    registries = ['docker.io']
+  '';
+
+  environment.systemPackages = with pkgs;
+    let
+      podman-bin = writeShellScriptBin "podman" ''
+        HOME="$XDG_CONFIG_HOME/podman"
+        exec ${podman}/bin/podman "$@"
+      '';
+    in
+      [ podman-bin podman.man runc conmon slirp4netns ];
+
+  xdg.config.users.qyliss.paths."podman/.config/containers/libpod.conf" =
+    pkgs.writeText "libpod.conf" ''
+      runtime_path = ["${pkgs.runc}/bin/runc"]
+      conmon_path = ["${pkgs.conmon}/bin/conmon"]
+    '';
+
+  xdg.config.users.qyliss.paths."podman/.config/containers/storage.conf" =
+    pkgs.writeText "storage.conf" ''
+      [storage]
+      driver = "vfs"
+      runroot = "/tmp/1000"
+      graphroot = "/home/state/podman/containers/storage"
+    '';
+
+  home.qyliss.dirs."state/podman" = {};
+}
diff --git a/modules/workstation/weechat/default.nix b/modules/workstation/weechat/default.nix
new file mode 100644
index 000000000000..2bc2d07d26af
--- /dev/null
+++ b/modules/workstation/weechat/default.nix
@@ -0,0 +1,118 @@
+{ pkgs, lib, ... }:
+
+with lib;
+
+let
+  networks = [ "freenode" ];
+
+  toWeeChat = value:
+    /**/ if value == true  then "on"
+    else if value == false then "off"
+    else if isList value   then concatStringsSep "," value
+    else toString value;
+
+  sec = [ "znc.username" "znc.password" "slack.api_tokens" ];
+
+  cfgin = {
+    alias.cmd.B = "buffer";
+    irc.look.buffer_switch_autojoin = false;
+    irc.look.display_join_message = false;
+    irc.look.server_buffer = "independent";
+    irc.look.temporary_servers = true;
+
+    irc.server_default = {
+      addresses = "znc.qyliss.net/6697";
+      autoconnect = true;
+      capabilities = [ "account-notify" "away-notify" "cap-notify" "multi-prefix" "server-time" "znc.in/server-time-iso" "znc.in/self-message" "znc.in/playback" ];
+      nicks = "qyliss";
+      password = "\\\${sec.data.znc.password}";
+      ssl = true;
+      username = "\\\${sec.data.znc.username}";
+    };
+
+    irc.server = genAttrs networks (s:
+      { username = "'\\\${sec.data.znc.username}/${s}'"; });
+    plugins.var.python.zncplayback.servers = networks;
+
+    logger.color.backlog_end = "*default";
+    logger.look.backlog = 200;
+
+    plugins.var.python.slack.slack_api_token = "\\\${sec.data.slack.api_tokens}";
+    plugins.var.python.slack.auto_open_threads = true;
+    plugins.var.python.slack.background_load_all_history = true;
+    plugins.var.python.slack.short_buffer_names = true;
+    plugins.var.python.slack.show_reaction_nicks = true;
+    plugins.var.python.vimode.no_warn = true;
+
+    script.look.sort = "p,n";
+
+    weechat.bar.buflist.hidden = true;
+    weechat.bar.fset.items = "fset";
+    weechat.bar.input.items = "[mode_indicator]+ [input_prompt]+(away),[input_search],[input_paste],input_text,[vi_buffer]";
+    weechat.bar.status.items = "[otr],[buffer_plugin],buffer_name+(buffer_modes)+{buffer_nicklist_count}+buffer_zoom+buffer_filter,scroll,[lag],[hotlist],completion";
+
+    weechat.color.chat_nick_colors = [ "cyan" "magenta" "green" "brown" "lightblue" "lightcyan" "lightmagenta" "lightgreen" "blue" ];
+    weechat.color.chat_nick_self = "default";
+    weechat.color.status_count_other = "white";
+    weechat.color.status_data_other = "white";
+    weechat.color.status_nicklist_count = "white";
+    weechat.color.status_time = "white";
+
+    weechat.completion.default_template = "%(nicks)|%(irc_channels)|%(emoji)";
+    weechat.completion.nick_completer = ":";
+
+    weechat.look.buffer_notify_default = "message";
+    weechat.look.highlight = [ "@edinburgh-staff" "@devp" "qyliss" "alyssa*" "*dntmissher" "*@alyssa" ];
+    weechat.look.hotlist_names_count = 10;
+    weechat.look.hotlist_names_level = 14;
+    weechat.look.mouse = true;
+    weechat.look.prefix_align_max = 12;
+    weechat.look.save_config_on_exit = false;
+    weechat.look.window_title = "WeeChat \\\${info:version}";
+  };
+
+  commands =
+    map (d: ''/set sec.data.${d} test'') sec ++ [ "/save" ] ++
+    map (n: "/server add ${n} ${cfgin.irc.server_default.addresses}") networks ++
+    mapAttrsToList (name: value: "/set ${name} ${toWeeChat value}")
+                   (flattenAttrs cfgin);
+
+  flattenAttrs' = sep: attrs:
+    listToAttrs (concatLists (flip mapAttrsToList attrs (k: v:
+      if isAttrs v then mapAttrsToList (k': nameValuePair "${k}${sep}${k'}") (flattenAttrs' sep v)
+                 else [ (nameValuePair k v) ])));
+
+  flattenAttrs = flattenAttrs' ".";
+
+  cfg = pkgs.runCommand "weechat-config" {} (lib.traceVal ''
+    ${pkgs.weechat}/bin/weechat-headless -d $out \
+        ${concatMapStringsSep " " (cmd: "-r ${escapeShellArg cmd}") commands} \
+        -r /save \
+        -r /exit
+  '');
+
+in
+
+{
+  environment.extraInit = ''
+    export WEECHAT_HOME="$HOME/state/weechat"
+  '';
+
+  environment.systemPackages = with pkgs; [
+    (wrapWeechat (weechat-unwrapped.override { pythonPackages = python3Packages; }) {
+      configure = { availablePlugins, ... }: {
+        scripts = with weechatScripts;
+          [ colorize_nicks go wee-slack zncplayback ];
+      };
+    })
+  ];
+
+  home.qyliss.dirs."state/weechat".activationScripts.config = ''
+    for file in ${cfg}/*.conf
+    do
+        if [ "$file" != ${cfg}/sec.conf ]
+        then ln -sf $file $(basename $file)
+        fi
+    done
+  '';
+}
diff --git a/modules/workstation/windowing/alacritty/config.yml b/modules/workstation/windowing/alacritty/config.yml
new file mode 100644
index 000000000000..c6392a929a09
--- /dev/null
+++ b/modules/workstation/windowing/alacritty/config.yml
@@ -0,0 +1,345 @@
+# Any items in the `env` entry below will be added as
+# environment variables. Some entries may override variables
+# set by alacritty itself.
+#env:
+  # TERM variable
+  #
+  # This value is used to set the `$TERM` environment variable for
+  # each instance of Alacritty. If it is not present, alacritty will
+  # check the local terminfo database and use 'alacritty' if it is
+  # available, otherwise 'xterm-256color' is used.
+  #TERM: xterm-256color
+
+window:
+  # If both are `0`, this setting is ignored.
+  dimensions:
+    columns: 80
+    lines: 24
+
+  padding:
+    x: 2
+    y: 2
+
+  dynamic_padding: true
+  decorations: none
+  startup_mode: Windowed
+
+scrolling:
+  history: 0 # disabled
+
+# Some applications, like Emacs, rely on knowing about the width of a tab.
+# To prevent unexpected behavior in these applications, it's also required to
+# change the `it` value in terminfo when altering this setting.
+tabspaces: 8
+
+font:
+  normal:
+    family: monospace
+    #style: Regular
+
+  bold:
+    family: monospace
+    #style: Bold
+
+  italic:
+    family: monospace
+    #style: Italic
+
+  offset:
+    x: 0
+    y: 0
+
+  glyph_offset:
+    x: 0
+    y: 0
+
+draw_bold_text_with_bright_colors: true
+
+colors:
+  primary:
+    background: '0x000000'
+    foreground: '0xffffff'
+    # dim_foreground: auto
+    # bright_foreground: normal foreground color
+
+  cursor:
+    text:   '0x161616'
+    cursor: '0xfcdc07'
+
+  normal:
+    black:   '0x2e3436'
+    red:     '0xb40000'
+    green:   '0x307000'
+    yellow:  '0xce5c00'
+    blue:    '0x3465a4'
+    magenta: '0x75507b'
+    cyan:    '0x06989a'
+    white:   '0xd3d7cf'
+
+  bright:
+    black:   '0x555753'
+    red:     '0xcc0000'
+    green:   '0x4e9a06'
+    yellow:  '0xedd400'
+    blue:    '0x729fcf'
+    magenta: '0xad7fa8'
+    cyan:    '0x34e2e2'
+    white:   '0xeeeeec'
+
+  # dim: default
+  # indexed_colors: default
+
+# Values for `animation`:
+#   - Ease
+#   - EaseOut
+#   - EaseOutSine
+#   - EaseOutQuad
+#   - EaseOutCubic
+#   - EaseOutQuart
+#   - EaseOutQuint
+#   - EaseOutExpo
+#   - EaseOutCirc
+#   - Linear
+#
+# Specifying a `duration` of `0` will disable the visual bell.
+visual_bell:
+  animation: EaseOutExpo
+  duration: 1
+
+background_opacity: 0.8
+
+# Available fields:
+#   - mouse
+#   - action
+#   - mods (optional)
+#
+# Values for `mouse`:
+#   - Middle
+#   - Left
+#   - Right
+#   - Numeric identifier such as `5`
+#
+# All available `mods` and `action` values are documented in the key binding
+# section.
+mouse_bindings:
+  - { mouse: Middle, action: PasteSelection }
+
+mouse:
+  double_click: { threshold: 300 }
+  triple_click: { threshold: 300 }
+  hide_when_typing: false
+
+  url:
+    launcher: None
+
+selection:
+  semantic_escape_chars: ",│`|:\"' ()[]{}<>"
+
+  # When set to `true`, selected text will be copied to both the primary and
+  # the selection clipboard. Otherwise, it will only be copied to the selection
+  # clipboard.
+  save_to_clipboard: false
+
+dynamic_title: true
+
+cursor:
+  style: Block
+  unfocused_hollow: true
+
+live_config_reload: true
+
+# Shell
+#
+# You can set `shell.program` to the path of your favorite shell, e.g. `/bin/fish`.
+# Entries in `shell.args` are passed unmodified as arguments to the shell.
+#shell:
+#  program: /bin/bash
+#  args:
+#    - --login
+
+# Key bindings
+#
+# Key bindings are specified as a list of objects. Each binding will specify
+# a key and modifiers required to trigger it, terminal modes where the binding
+# is applicable, and what should be done when the key binding fires. It can
+# either send a byte sequnce to the running application (`chars`), execute
+# a predefined action (`action`) or fork and execute a specified command plus
+# arguments (`command`).
+#
+# Example:
+#   `- { key: V, mods: Command, action: Paste }`
+#
+# Available fields:
+#   - key
+#   - mods (optional)
+#   - chars | action | command (exactly one required)
+#   - mode (optional)
+#
+# Values for `key`:
+#   - `A` -> `Z`
+#   - `F1` -> `F12`
+#   - `Key1` -> `Key0`
+#
+#   A full list with available key codes can be found here:
+#   https://docs.rs/glutin/*/glutin/enum.VirtualKeyCode.html#variants
+#
+#   Instead of using the name of the keys, the `key` field also supports using
+#   the scancode of the desired key. Scancodes have to be specified as a
+#   decimal number.
+#   This command will allow you to display the hex scancodes for certain keys:
+#     `showkey --scancodes`
+#
+# Values for `mods`:
+#   - Command
+#   - Control
+#   - Shift
+#   - Alt
+#
+#   Multiple `mods` can be combined using `|` like this: `mods: Control|Shift`.
+#   Whitespace and capitalization is relevant and must match the example.
+#
+# Values for `chars`:
+#   The `chars` field writes the specified string to the terminal. This makes
+#   it possible to pass escape sequences.
+#   To find escape codes for bindings like `PageUp` ("\x1b[5~"), you can run
+#   the command `showkey -a` outside of tmux.
+#   Note that applications use terminfo to map escape sequences back to
+#   keys. It is therefore required to update the terminfo when
+#   changing an escape sequence.
+#
+# Values for `action`:
+#   - Paste
+#   - PasteSelection
+#   - Copy
+#   - IncreaseFontSize
+#   - DecreaseFontSize
+#   - ResetFontSize
+#   - ScrollPageUp
+#   - ScrollPageDown
+#   - ScrollToTop
+#   - ScrollToBottom
+#   - ClearHistory
+#   - Hide
+#   - Quit
+#   - ClearLogNotice
+#
+# Values for `command`:
+#   The `command` field must be a map containing a `program` string and
+#   an `args` array of command line parameter strings.
+#
+#   Example:
+#       `command: { program: "alacritty", args: ["-e", "vttest"] }`
+#
+# Values for `mode`:
+#   - ~AppCursor
+#   - AppCursor
+#   - ~AppKeypad
+#   - AppKeypad
+key_bindings:
+  - { key: V,        mods: Control|Shift,    action: Paste               }
+  - { key: C,        mods: Control|Shift,    action: Copy                }
+  - { key: Paste,                   action: Paste                        }
+  - { key: Copy,                    action: Copy                         }
+  - { key: Q,        mods: Command, action: Quit                         }
+  - { key: W,        mods: Command, action: Quit                         }
+  - { key: Insert,   mods: Shift,   action: PasteSelection               }
+  - { key: Key0,     mods: Control, action: ResetFontSize                }
+  - { key: Equals,   mods: Control, action: IncreaseFontSize             }
+  - { key: Subtract, mods: Control, action: DecreaseFontSize             }
+  - { key: L,        mods: Control, action: ClearLogNotice               }
+  - { key: L,        mods: Control, chars: "\x0c"                        }
+  - { key: Home,                    chars: "\x1bOH",   mode: AppCursor   }
+  - { key: Home,                    chars: "\x1b[H",   mode: ~AppCursor  }
+  - { key: End,                     chars: "\x1bOF",   mode: AppCursor   }
+  - { key: End,                     chars: "\x1b[F",   mode: ~AppCursor  }
+  - { key: PageUp,   mods: Shift,   chars: "\x1b[5;2~"                   }
+  - { key: PageUp,   mods: Control, chars: "\x1b[5;5~"                   }
+  - { key: PageUp,                  chars: "\x1b[5~"                     }
+  - { key: PageDown, mods: Shift,   chars: "\x1b[6;2~"                   }
+  - { key: PageDown, mods: Control, chars: "\x1b[6;5~"                   }
+  - { key: PageDown,                chars: "\x1b[6~"                     }
+  - { key: Tab,      mods: Shift,   chars: "\x1b[Z"                      }
+  - { key: Back,                    chars: "\x7f"                        }
+  - { key: Back,     mods: Alt,     chars: "\x1b\x7f"                    }
+  - { key: Insert,                  chars: "\x1b[2~"                     }
+  - { key: Delete,                  chars: "\x1b[3~"                     }
+  - { key: Left,     mods: Shift,   chars: "\x1b[1;2D"                   }
+  - { key: Left,     mods: Control, chars: "\x1b[1;5D"                   }
+  - { key: Left,     mods: Alt,     chars: "\x1b[1;3D"                   }
+  - { key: Left,                    chars: "\x1b[D",   mode: ~AppCursor  }
+  - { key: Left,                    chars: "\x1bOD",   mode: AppCursor   }
+  - { key: Right,    mods: Shift,   chars: "\x1b[1;2C"                   }
+  - { key: Right,    mods: Control, chars: "\x1b[1;5C"                   }
+  - { key: Right,    mods: Alt,     chars: "\x1b[1;3C"                   }
+  - { key: Right,                   chars: "\x1b[C",   mode: ~AppCursor  }
+  - { key: Right,                   chars: "\x1bOC",   mode: AppCursor   }
+  - { key: Up,       mods: Shift,   chars: "\x1b[1;2A"                   }
+  - { key: Up,       mods: Control, chars: "\x1b[1;5A"                   }
+  - { key: Up,       mods: Alt,     chars: "\x1b[1;3A"                   }
+  - { key: Up,                      chars: "\x1b[A",   mode: ~AppCursor  }
+  - { key: Up,                      chars: "\x1bOA",   mode: AppCursor   }
+  - { key: Down,     mods: Shift,   chars: "\x1b[1;2B"                   }
+  - { key: Down,     mods: Control, chars: "\x1b[1;5B"                   }
+  - { key: Down,     mods: Alt,     chars: "\x1b[1;3B"                   }
+  - { key: Down,                    chars: "\x1b[B",   mode: ~AppCursor  }
+  - { key: Down,                    chars: "\x1bOB",   mode: AppCursor   }
+  - { key: F1,                      chars: "\x1bOP"                      }
+  - { key: F2,                      chars: "\x1bOQ"                      }
+  - { key: F3,                      chars: "\x1bOR"                      }
+  - { key: F4,                      chars: "\x1bOS"                      }
+  - { key: F5,                      chars: "\x1b[15~"                    }
+  - { key: F6,                      chars: "\x1b[17~"                    }
+  - { key: F7,                      chars: "\x1b[18~"                    }
+  - { key: F8,                      chars: "\x1b[19~"                    }
+  - { key: F9,                      chars: "\x1b[20~"                    }
+  - { key: F10,                     chars: "\x1b[21~"                    }
+  - { key: F11,                     chars: "\x1b[23~"                    }
+  - { key: F12,                     chars: "\x1b[24~"                    }
+  - { key: F1,       mods: Shift,   chars: "\x1b[1;2P"                   }
+  - { key: F2,       mods: Shift,   chars: "\x1b[1;2Q"                   }
+  - { key: F3,       mods: Shift,   chars: "\x1b[1;2R"                   }
+  - { key: F4,       mods: Shift,   chars: "\x1b[1;2S"                   }
+  - { key: F5,       mods: Shift,   chars: "\x1b[15;2~"                  }
+  - { key: F6,       mods: Shift,   chars: "\x1b[17;2~"                  }
+  - { key: F7,       mods: Shift,   chars: "\x1b[18;2~"                  }
+  - { key: F8,       mods: Shift,   chars: "\x1b[19;2~"                  }
+  - { key: F9,       mods: Shift,   chars: "\x1b[20;2~"                  }
+  - { key: F10,      mods: Shift,   chars: "\x1b[21;2~"                  }
+  - { key: F11,      mods: Shift,   chars: "\x1b[23;2~"                  }
+  - { key: F12,      mods: Shift,   chars: "\x1b[24;2~"                  }
+  - { key: F1,       mods: Control, chars: "\x1b[1;5P"                   }
+  - { key: F2,       mods: Control, chars: "\x1b[1;5Q"                   }
+  - { key: F3,       mods: Control, chars: "\x1b[1;5R"                   }
+  - { key: F4,       mods: Control, chars: "\x1b[1;5S"                   }
+  - { key: F5,       mods: Control, chars: "\x1b[15;5~"                  }
+  - { key: F6,       mods: Control, chars: "\x1b[17;5~"                  }
+  - { key: F7,       mods: Control, chars: "\x1b[18;5~"                  }
+  - { key: F8,       mods: Control, chars: "\x1b[19;5~"                  }
+  - { key: F9,       mods: Control, chars: "\x1b[20;5~"                  }
+  - { key: F10,      mods: Control, chars: "\x1b[21;5~"                  }
+  - { key: F11,      mods: Control, chars: "\x1b[23;5~"                  }
+  - { key: F12,      mods: Control, chars: "\x1b[24;5~"                  }
+  - { key: F1,       mods: Alt,     chars: "\x1b[1;6P"                   }
+  - { key: F2,       mods: Alt,     chars: "\x1b[1;6Q"                   }
+  - { key: F3,       mods: Alt,     chars: "\x1b[1;6R"                   }
+  - { key: F4,       mods: Alt,     chars: "\x1b[1;6S"                   }
+  - { key: F5,       mods: Alt,     chars: "\x1b[15;6~"                  }
+  - { key: F6,       mods: Alt,     chars: "\x1b[17;6~"                  }
+  - { key: F7,       mods: Alt,     chars: "\x1b[18;6~"                  }
+  - { key: F8,       mods: Alt,     chars: "\x1b[19;6~"                  }
+  - { key: F9,       mods: Alt,     chars: "\x1b[20;6~"                  }
+  - { key: F10,      mods: Alt,     chars: "\x1b[21;6~"                  }
+  - { key: F11,      mods: Alt,     chars: "\x1b[23;6~"                  }
+  - { key: F12,      mods: Alt,     chars: "\x1b[24;6~"                  }
+  - { key: F1,       mods: Super,   chars: "\x1b[1;3P"                   }
+  - { key: F2,       mods: Super,   chars: "\x1b[1;3Q"                   }
+  - { key: F3,       mods: Super,   chars: "\x1b[1;3R"                   }
+  - { key: F4,       mods: Super,   chars: "\x1b[1;3S"                   }
+  - { key: F5,       mods: Super,   chars: "\x1b[15;3~"                  }
+  - { key: F6,       mods: Super,   chars: "\x1b[17;3~"                  }
+  - { key: F7,       mods: Super,   chars: "\x1b[18;3~"                  }
+  - { key: F8,       mods: Super,   chars: "\x1b[19;3~"                  }
+  - { key: F9,       mods: Super,   chars: "\x1b[20;3~"                  }
+  - { key: F10,      mods: Super,   chars: "\x1b[21;3~"                  }
+  - { key: F11,      mods: Super,   chars: "\x1b[23;3~"                  }
+  - { key: F12,      mods: Super,   chars: "\x1b[24;3~"                  }
diff --git a/modules/workstation/windowing/alacritty/default.nix b/modules/workstation/windowing/alacritty/default.nix
new file mode 100644
index 000000000000..b3790c4fe6a8
--- /dev/null
+++ b/modules/workstation/windowing/alacritty/default.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+
+{
+  imports = [ ../../../xdg ];
+
+  environment.systemPackages = with pkgs;
+    lib.optional (!stdenv.isDarwin) alacritty;
+
+  xdg.config.users.qyliss.paths."alacritty/alacritty.yml" =
+    pkgs.copyPathToStore ./config.yml;
+}
diff --git a/modules/workstation/windowing/default.nix b/modules/workstation/windowing/default.nix
new file mode 100644
index 000000000000..331732094677
--- /dev/null
+++ b/modules/workstation/windowing/default.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  imports = [ ./alacritty ./firefox ./sway ];
+
+  environment.systemPackages = with pkgs; [ imv ];
+}
diff --git a/modules/workstation/windowing/firefox/default.nix b/modules/workstation/windowing/firefox/default.nix
new file mode 100644
index 000000000000..877f0ef0892c
--- /dev/null
+++ b/modules/workstation/windowing/firefox/default.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+
+{
+  home.qyliss.dirs.state.activationScripts.profile = ''
+    install -o qyliss -g users -d mozilla{,/firefox{,/default}}
+    ln -sf ${./profiles.ini} mozilla/firefox/profiles.ini
+    ln -sf ${./user.js} mozilla/firefox/default/user.js
+  '';
+
+  environment.systemPackages = with pkgs; [ firefox-wayland ];
+
+  environment.variables.BROWSER = "firefox";
+}
diff --git a/modules/workstation/windowing/firefox/profiles.ini b/modules/workstation/windowing/firefox/profiles.ini
new file mode 100644
index 000000000000..becf53354e76
--- /dev/null
+++ b/modules/workstation/windowing/firefox/profiles.ini
@@ -0,0 +1,8 @@
+[General]
+StartWithLastProfile=1
+
+[Profile0]
+Name=default
+IsRelative=1
+Path=default
+Default=1
diff --git a/modules/workstation/windowing/firefox/user.js b/modules/workstation/windowing/firefox/user.js
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/modules/workstation/windowing/firefox/user.js
@@ -0,0 +1 @@
+
diff --git a/modules/workstation/windowing/sway/choose_workspace.sh.in b/modules/workstation/windowing/sway/choose_workspace.sh.in
new file mode 100644
index 000000000000..84263039fcd9
--- /dev/null
+++ b/modules/workstation/windowing/sway/choose_workspace.sh.in
@@ -0,0 +1,17 @@
+#! @shell@ -ue
+swaymsg -t get_workspaces |
+    @jq@/bin/jq -r \
+        '(to_entries | map(select(.value.focused)) | .[0].key), .[].name' |
+    (
+        read index
+        exec @bemenu@/bin/bemenu \
+            -p workspace \
+            -I "$index" \
+            --fn 'monospace 10' \
+            --line-height 22 \
+            --nf '#777777' \
+            --hb '#285577' \
+            --hf '#ffffff' \
+            --tf '#777777' \
+            --ff '#ffffff'
+    )
diff --git a/modules/workstation/windowing/sway/config.in b/modules/workstation/windowing/sway/config.in
new file mode 100644
index 000000000000..7f2ce3f86f7f
--- /dev/null
+++ b/modules/workstation/windowing/sway/config.in
@@ -0,0 +1,96 @@
+set $mod Mod4
+set $left h
+set $down j
+set $up k
+set $right l
+
+default_border pixel
+default_floating_border pixel
+
+client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a00
+client.unfocused        #333333 #222222 #888888 #292d2e #22222200
+
+for_window [app_id="float"] {
+    floating enable
+}
+
+for_window [class="Tor Browser"] {
+    floating enable
+    border normal
+}
+
+input * natural_scroll enabled
+output * bg @wallpaper@ fill
+
+bindsym $mod+Return exec alacritty
+bindsym $mod+backslash exec firefox
+bindsym $mod+Shift+q kill
+bindsym $mod+d exec swaymsg exec "$(choosebin --tiebreak=begin,length,index)"
+
+# Drag floating windows by holding down $mod and left mouse button.
+# Resize them with right mouse button + $mod.
+# Despite the name, also works for non-floating windows.
+# Change normal to inverse to use left mouse button for resizing and right
+# mouse button for dragging.
+floating_modifier $mod normal
+
+# reload the configuration file
+bindsym $mod+Shift+c reload
+
+# exit sway (logs you out of your Wayland session)
+bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'
+
+bindsym $mod+$left focus left
+bindsym $mod+$down focus down
+bindsym $mod+$up focus up
+bindsym $mod+$right focus right
+
+bindsym $mod+Shift+$left move left
+bindsym $mod+Shift+$down move down
+bindsym $mod+Shift+$up move up
+bindsym $mod+Shift+$right move right
+
+bindsym $mod+g exec swaymsg workspace "$(@choose_workspace@)"
+bindsym $mod+Shift+g exec swaymsg move container to workspace "$(@choose_workspace@)"
+
+bindsym $mod+b splith
+bindsym $mod+v splitv
+
+bindsym $mod+s layout stacking
+bindsym $mod+w layout tabbed
+bindsym $mod+e layout toggle split
+
+bindsym $mod+f fullscreen
+
+bindsym $mod+Shift+space floating toggle
+bindsym $mod+space focus mode_toggle
+
+bindsym $mod+a focus parent
+
+bindsym $mod+Shift+minus move scratchpad
+bindsym $mod+minus scratchpad show
+
+mode "resize" {
+    bindsym $left resize shrink width 10px
+    bindsym $down resize grow height 10px
+    bindsym $up resize shrink height 10px
+    bindsym $right resize grow width 10px
+
+    bindsym Return mode "default"
+    bindsym Escape mode "default"
+}
+bindsym $mod+r mode "resize"
+
+bar {
+    position top
+
+    status_command @status_command@
+
+    colors {
+        statusline #ffffff
+        background #00000077
+        inactive_workspace #33333377 #00000077 #FFFFFF77
+    }
+}
+
+@extraConfig@
diff --git a/modules/workstation/windowing/sway/default.nix b/modules/workstation/windowing/sway/default.nix
new file mode 100644
index 000000000000..772e44319027
--- /dev/null
+++ b/modules/workstation/windowing/sway/default.nix
@@ -0,0 +1,54 @@
+{ pkgs, lib, config, ... }:
+
+{
+  imports = [ ./swayidle ];
+
+  options = {
+    programs.sway.extraConfig = with lib; mkOption {
+      type = types.lines;
+      description = "Lines to append to sway's config file";
+      default = "";
+    };
+  };
+
+  config = let
+    cfg = config.programs.sway;
+
+    wallpaper = pkgs.fetchurl {
+      url = https://mir-s3-cdn-cf.behance.net/project_modules/2800_opt_1/36731876964505.5c793fa788b5d.jpg;
+      sha256 = "1c6camdipng8ws41sgpcxzrxb96crgip3wirqjgf2ajn60qg3v64";
+
+      meta = with lib; {
+        homepage = https://www.behance.net/gallery/76964505/IQOO-style-frame-and-scene-design;
+      };
+    };
+
+    configFile = pkgs.substituteAll {
+      src = ./config.in;
+      inherit choose_workspace status_command wallpaper;
+      inherit (cfg) extraConfig;
+    };
+
+    status_command = pkgs.substituteAll {
+      src = ./status_command.in;
+      isExecutable = true;
+      inherit (pkgs) execline;
+    };
+
+    choose_workspace = pkgs.substituteAll {
+      src = ./choose_workspace.sh.in;
+      isExecutable = true;
+      inherit (pkgs) bemenu jq;
+    };
+
+  in
+
+  {
+    environment.systemPackages = with pkgs; [ bemenu choose ];
+
+    programs.sway.enable = true;
+    programs.swayidle.enable = true;
+
+    xdg.config.users.qyliss.paths."sway/config" = configFile;
+  };
+}
diff --git a/modules/workstation/windowing/sway/status_command.in b/modules/workstation/windowing/sway/status_command.in
new file mode 100644
index 000000000000..b2cd2c792b28
--- /dev/null
+++ b/modules/workstation/windowing/sway/status_command.in
@@ -0,0 +1,39 @@
+#! @execline@/bin/execlineb
+
+loopwhilex
+
+elglob bats /sys/class/power_supply/BAT*
+
+# We need to capture the whole status line, and then echo it all at
+# once, to work around https://github.com/swaywm/sway/issues/3857.
+backtick -i -n line {
+  foreground {
+    forx bat { $bats }
+    importas -i -u bat bat
+
+    foreground {
+      backtick -i -n status { cat ${bat}/status }
+      importas -i -u status status
+
+      ifelse { test $status = Charging }
+      { printf "↑" }
+
+      if { test $status = Discharging }
+      printf "↓"
+    }
+
+    foreground {
+      redirfd -r 0 ${bat}/capacity
+      tr -d "\n"
+    }
+
+    foreground { printf "%%  " }
+  }
+
+  foreground { date "+%Y-%m-%d %H:%M:%S" }
+}
+importas -i -u line line
+
+if { echo $line }
+
+sleep 1
diff --git a/modules/workstation/windowing/sway/swayidle/default.nix b/modules/workstation/windowing/sway/swayidle/default.nix
new file mode 100644
index 000000000000..8e5f264b5038
--- /dev/null
+++ b/modules/workstation/windowing/sway/swayidle/default.nix
@@ -0,0 +1,23 @@
+{ lib, config, ... }:
+
+let
+  cfg = config.programs.swayidle;
+in
+
+with lib;
+
+{
+  options = {
+    programs.swayidle.enable = mkEnableOption "swayidle";
+  };
+
+  config = mkIf cfg.enable {
+    programs.sway.extraConfig = ''
+      exec swayidle \
+          timeout 300 'swaylock -c 000000' \
+          timeout 600 'swaymsg "output * dpms off"' \
+          resume 'swaymsg "output * dpms on"' \
+          before-sleep 'swaylock -c 000000'
+    '';
+  };
+}
diff --git a/modules/xdg/default.nix b/modules/xdg/default.nix
new file mode 100644
index 000000000000..d3a2d1235144
--- /dev/null
+++ b/modules/xdg/default.nix
@@ -0,0 +1,44 @@
+{ lib, pkgs, config, ... }:
+
+let
+  inherit (lib) mapAttrsToList mkOption;
+  inherit (lib.types) attrsOf path submodule;
+  inherit (pkgs) linkFarm;
+
+in
+  {
+    options = {
+      xdg.config.users = mkOption {
+        default = {};
+        type = attrsOf (submodule ({ ... }: {
+          options = {
+            paths = mkOption {
+              default = {};
+              type = attrsOf path;
+            };
+          };
+        }));
+      };
+    };
+
+    config = {
+      environment.etc."xdg/nixos/per-user".source =
+        linkFarm "xdg-config-users"
+                  (mapAttrsToList (user: { paths, ... }: {
+                    name = user;
+                    path = linkFarm "${user}-xdg-config-home"
+                                    (mapAttrsToList
+                                      (name: path: { inherit name path; })
+                                      paths);
+                  }) config.xdg.config.users);
+
+      environment.extraInit = ''
+        etc_xdg_config_home=/run/current-system/etc/xdg/nixos/per-user/$USER
+        if [ -d "$etc_xdg_config_home" ]; then
+            export XDG_CONFIG_HOME="''${XDG_CONFIG_HOME-$etc_xdg_config_home}"
+        fi
+        export XDG_DATA_HOME="''${XDG_DATA_HOME-$HOME/state}"
+        export XDG_CACHE_HOME="''${XDG_DATA_HOME-$HOME/state/cache}"
+      '';
+    };
+  }
diff --git a/nixpkgs-overlays/patches/bemenu/default.nix b/nixpkgs-overlays/patches/bemenu/default.nix
new file mode 100644
index 000000000000..4de73a856048
--- /dev/null
+++ b/nixpkgs-overlays/patches/bemenu/default.nix
@@ -0,0 +1,18 @@
+{ bemenu, fetchpatch }:
+
+bemenu.overrideAttrs ({ patches ? [], ... }: {
+  patches = patches ++ [
+    (fetchpatch {
+      url = https://github.com/Cloudef/bemenu/commit/ab82afab7f8da81fbd6445a0b65fb70ecba898b8.patch;
+      sha256 = "0nn0jb33aq893ql8lgmajma9a5fjhz68c4aqjrgawz6lljxlbafg";
+    })
+    (fetchpatch {
+      url = https://github.com/Cloudef/bemenu/commit/330a340a72e9909bfbae4bfa51a8502f9c66ddc1.patch;
+      sha256 = "0iyd8c0l3g7f49p0vz493f8rzzvj5fdbqv13lzvnn77bfv0bpd4v";
+    })
+    (fetchpatch {
+      url = https://github.com/hexd0t/bemenu/commit/c7ceb253ed88be40c83a0d7c5772945119c294fa.patch;
+      sha256 = "0rc27n5shclaki578s0vwwgr9d2xkyljak75hc24adkg4zj1vly8";
+    })
+  ];
+})
diff --git a/nixpkgs-overlays/patches/default.nix b/nixpkgs-overlays/patches/default.nix
new file mode 100644
index 000000000000..54a8071c687f
--- /dev/null
+++ b/nixpkgs-overlays/patches/default.nix
@@ -0,0 +1,11 @@
+self: super: {
+  bemenu = self.callPackage ./bemenu { inherit (super) bemenu; };
+
+  firefoxPackages = self.callPackage ./firefox/packages.nix {
+    inherit (super) firefoxPackages;
+  };
+
+  neomutt = self.callPackage ./neomutt { inherit (super) neomutt; };
+
+  tmux = self.callPackage ./tmux { inherit (super) tmux; };
+}
diff --git a/nixpkgs-overlays/patches/firefox/beta/D6695.diff b/nixpkgs-overlays/patches/firefox/beta/D6695.diff
new file mode 100644
index 000000000000..f8a8deeb8581
--- /dev/null
+++ b/nixpkgs-overlays/patches/firefox/beta/D6695.diff
@@ -0,0 +1,281 @@
+diff --git a/toolkit/moz.build b/toolkit/moz.build
+index 109fb2c..0b871d9 100644
+--- a/toolkit/moz.build
++++ b/toolkit/moz.build
+@@ -72,3 +72,5 @@ with Files('mozapps/preferences/**'):
+ with Files('pluginproblem/**'):
+     BUG_COMPONENT = ('Core', 'Plug-ins')
+ 
++if CONFIG['ENABLE_TESTS']:
++    DIRS += ['tests/gtest']
+diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
+index aafe82e..2d850fe 100644
+--- a/toolkit/xre/nsXREDirProvider.cpp
++++ b/toolkit/xre/nsXREDirProvider.cpp
+@@ -390,13 +390,6 @@ nsXREDirProvider::GetFile(const char* aProperty, bool* aPersistent,
+     nsCOMPtr<nsIFile> localDir;
+     rv = GetUserDataDirectoryHome(getter_AddRefs(localDir), false);
+     if (NS_SUCCEEDED(rv)) {
+-#if defined(XP_MACOSX)
+-      rv = localDir->AppendNative(NS_LITERAL_CSTRING("Mozilla"));
+-#else
+-      rv = localDir->AppendNative(NS_LITERAL_CSTRING(".mozilla"));
+-#endif
+-    }
+-    if (NS_SUCCEEDED(rv)) {
+       localDir.swap(file);
+     }
+   }
+@@ -1238,7 +1231,8 @@ nsresult nsXREDirProvider::GetUpdateRootDir(nsIFile** aResult,
+             nsDependentCString(hasVendor ? GetAppVendor() : GetAppName())))) {
+       return NS_ERROR_FAILURE;
+     }
+-  } else if (NS_FAILED(localDir->AppendNative(NS_LITERAL_CSTRING("Mozilla")))) {
++  }
++  else if (NS_FAILED(localDir->AppendNative(NS_LITERAL_CSTRING("Mozilla")))) {
+     return NS_ERROR_FAILURE;
+   }
+ 
+@@ -1367,6 +1361,9 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
+   NS_ENSURE_SUCCESS(rv, rv);
+ 
+   localDir = dirFileMac;
++
++  rv = localDir->AppendRelativeNativePath(nsDependentCString("Mozilla"));
++  NS_ENSURE_SUCCESS(rv, rv);
+ #elif defined(XP_IOS)
+   nsAutoCString userDir;
+   if (GetUIKitDirectory(aLocal, userDir)) {
+@@ -1390,6 +1387,9 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
+   NS_ENSURE_SUCCESS(rv, rv);
+ 
+   rv = NS_NewLocalFile(path, true, getter_AddRefs(localDir));
++  NS_ENSURE_SUCCESS(rv, rv);
++  rv = localDir->AppendRelativeNativePath(nsDependentCString("Mozilla"));
++  NS_ENSURE_SUCCESS(rv, rv);
+ #elif defined(XP_UNIX)
+   const char* homeDir = getenv("HOME");
+   if (!homeDir || !*homeDir) return NS_ERROR_FAILURE;
+@@ -1411,8 +1411,51 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
+         rv = localDir->AppendNative(NS_LITERAL_CSTRING(".cache"));
+     }
+   } else {
++    bool exists;
++    // check old config ~/.mozilla
+     rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true,
+                                getter_AddRefs(localDir));
++    NS_ENSURE_SUCCESS(rv, rv);
++    rv = localDir->AppendRelativeNativePath(nsDependentCString(".mozilla"));
++    NS_ENSURE_SUCCESS(rv, rv);
++    rv = localDir->Exists(&exists);
++    NS_ENSURE_SUCCESS(rv, rv);
++    // otherwise, use new config
++    if (!exists) {
++      const char* xdghomedir = getenv("XDG_DATA_HOME");
++      if (!xdghomedir || !*xdghomedir) {
++        rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true,
++                                   getter_AddRefs(localDir));
++        NS_ENSURE_SUCCESS(rv, rv);
++        rv = localDir->AppendRelativeNativePath(nsDependentCString(".local"));
++        NS_ENSURE_SUCCESS(rv, rv);
++        rv = localDir->Exists(&exists);
++        if (NS_SUCCEEDED(rv) && !exists) {
++          rv = localDir->Create(nsIFile::DIRECTORY_TYPE, 0755);
++          NS_ENSURE_SUCCESS(rv, rv);
++        }
++        rv = localDir->AppendRelativeNativePath(nsDependentCString("share"));
++        NS_ENSURE_SUCCESS(rv, rv);
++        rv = localDir->Exists(&exists);
++        if (NS_SUCCEEDED(rv) && !exists) {
++          rv = localDir->Create(nsIFile::DIRECTORY_TYPE, 0755);
++        }
++      }
++      else {
++        rv = NS_NewNativeLocalFile(nsDependentCString(xdghomedir), true,
++                               getter_AddRefs(localDir));
++      }
++      NS_ENSURE_SUCCESS(rv, rv);
++
++      rv = localDir->AppendRelativeNativePath(nsDependentCString("mozilla"));
++      NS_ENSURE_SUCCESS(rv, rv);
++      rv = localDir->Exists(&exists);
++      NS_ENSURE_SUCCESS(rv, rv);
++      if (NS_SUCCEEDED(rv) && !exists) {
++        rv = localDir->Create(nsIFile::DIRECTORY_TYPE, 0700);
++        NS_ENSURE_SUCCESS(rv, rv);
++      }
++    }
+   }
+ #else
+ #error "Don't know how to get product dir on your platform"
+@@ -1523,20 +1566,12 @@ nsresult nsXREDirProvider::AppendSysUserExtensionPath(nsIFile* aFile) {
+ 
+ #if defined(XP_MACOSX) || defined(XP_WIN)
+ 
+-  static const char* const sXR = "Mozilla";
+-  rv = aFile->AppendNative(nsDependentCString(sXR));
+-  NS_ENSURE_SUCCESS(rv, rv);
+-
+   static const char* const sExtensions = "Extensions";
+   rv = aFile->AppendNative(nsDependentCString(sExtensions));
+   NS_ENSURE_SUCCESS(rv, rv);
+ 
+ #elif defined(XP_UNIX)
+ 
+-  static const char* const sXR = ".mozilla";
+-  rv = aFile->AppendNative(nsDependentCString(sXR));
+-  NS_ENSURE_SUCCESS(rv, rv);
+-
+   static const char* const sExtensions = "extensions";
+   rv = aFile->AppendNative(nsDependentCString(sExtensions));
+   NS_ENSURE_SUCCESS(rv, rv);
+@@ -1554,20 +1589,12 @@ nsresult nsXREDirProvider::AppendSysUserExtensionsDevPath(nsIFile* aFile) {
+ 
+ #if defined(XP_MACOSX) || defined(XP_WIN)
+ 
+-  static const char* const sXR = "Mozilla";
+-  rv = aFile->AppendNative(nsDependentCString(sXR));
+-  NS_ENSURE_SUCCESS(rv, rv);
+-
+   static const char* const sExtensions = "SystemExtensionsDev";
+   rv = aFile->AppendNative(nsDependentCString(sExtensions));
+   NS_ENSURE_SUCCESS(rv, rv);
+ 
+ #elif defined(XP_UNIX)
+ 
+-  static const char* const sXR = ".mozilla";
+-  rv = aFile->AppendNative(nsDependentCString(sXR));
+-  NS_ENSURE_SUCCESS(rv, rv);
+-
+   static const char* const sExtensions = "systemextensionsdev";
+   rv = aFile->AppendNative(nsDependentCString(sExtensions));
+   NS_ENSURE_SUCCESS(rv, rv);
+@@ -1625,9 +1652,6 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) {
+   NS_ENSURE_SUCCESS(rv, rv);
+ #elif defined(XP_UNIX)
+   nsAutoCString folder;
+-  // Make it hidden (by starting with "."), except when local (the
+-  // profile is already under ~/.cache or XDG_CACHE_HOME).
+-  if (!aLocal) folder.Assign('.');
+ 
+   if (!profile.IsEmpty()) {
+     // Skip any leading path characters
+@@ -1647,8 +1671,12 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) {
+       folder.Append(vendor);
+       ToLowerCase(folder);
+ 
+-      rv = aFile->AppendNative(folder);
+-      NS_ENSURE_SUCCESS(rv, rv);
++      // Keep the 'mozilla' path for cache:
++      // Use ${XDG_DATA_HOME:-$HOME/.cache}/mozilla/firefox
++      if (aLocal) {
++        rv = aFile->AppendNative(folder);
++        NS_ENSURE_SUCCESS(rv, rv);
++      }
+ 
+       folder.Truncate();
+     }
+diff --git a/xpcom/io/nsAppFileLocationProvider.cpp b/xpcom/io/nsAppFileLocationProvider.cpp
+index 90e4ec9..8b838ec 100644
+--- a/xpcom/io/nsAppFileLocationProvider.cpp
++++ b/xpcom/io/nsAppFileLocationProvider.cpp
+@@ -247,7 +247,7 @@ nsresult nsAppFileLocationProvider::CloneMozBinDirectory(nsIFile** aLocalFile) {
+ // GetProductDirectory - Gets the directory which contains the application data
+ // folder
+ //
+-// UNIX   : ~/.mozilla/
++// UNIX   : ~/.mozilla/ or ${XDG_DATA_HOME:-~/.local/share}/mozilla
+ // WIN    : <Application Data folder on user's machine>\Mozilla
+ // Mac    : :Documents:Mozilla:
+ //----------------------------------------------------------------------------------------
+@@ -291,19 +291,80 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile,
+     return rv;
+   }
+ #elif defined(XP_UNIX)
+-  rv = NS_NewNativeLocalFile(nsDependentCString(PR_GetEnv("HOME")), true,
++  const char* homeDir = PR_GetEnv("HOME");
++  /* check old config ~/.mozilla */
++  rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true,
+                              getter_AddRefs(localDir));
+   if (NS_FAILED(rv)) {
+     return rv;
+   }
++  rv = localDir->AppendRelativeNativePath(nsDependentCString(".mozilla"));
++  if (NS_FAILED(rv)) {
++    return rv;
++  }
++  rv = localDir->Exists(&exists);
++  if (NS_FAILED(rv)) {
++    return rv;
++  }
++  /* otherwise, use new config */
++  if (!exists) {
++    const char* xdghomedir = PR_GetEnv("XDG_DATA_HOME");
++    if (!xdghomedir || !*xdghomedir) {
++      /* XDG_DATA_HOME=$HOME/.local/share */
++      rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true,
++                                 getter_AddRefs(localDir));
++      if (NS_FAILED(rv)) {
++        return rv;
++      }
++      rv = localDir->AppendRelativeNativePath(nsDependentCString(".local"));
++      if (NS_FAILED(rv)) {
++        return rv;
++      }
++      rv = localDir->Exists(&exists);
++      if (NS_SUCCEEDED(rv) && !exists) {
++        rv = localDir->Create(nsIFile::DIRECTORY_TYPE, 0755);
++        if (NS_FAILED(rv)) {
++          return rv;
++        }
++      }
++      rv = localDir->AppendRelativeNativePath(nsDependentCString("share"));
++      if (NS_FAILED(rv)) {
++        return rv;
++      }
++      rv = localDir->Exists(&exists);
++      if (NS_SUCCEEDED(rv) && !exists) {
++        rv = localDir->Create(nsIFile::DIRECTORY_TYPE, 0755);
++      }
++    }
++    else {
++      rv = NS_NewNativeLocalFile(nsDependentCString(xdghomedir), true,
++                                 getter_AddRefs(localDir));
++    }
++    if (NS_FAILED(rv)) {
++      return rv;
++    }
++    rv = localDir->AppendRelativeNativePath(nsDependentCString("mozilla"));
++    if (NS_FAILED(rv)) {
++      return rv;
++    }
++  }
+ #else
+ #error dont_know_how_to_get_product_dir_on_your_platform
+ #endif
+ 
++#if !defined(XP_UNIX) || defined(XP_MACOSX)
++  // Since we have to check for legacy configuration, we have
++  // the complete path for Linux already, so this is not
++  // needed. If we stop checking for legacy at some point,
++  // then we can change this to not be protected by
++  // this clause.
+   rv = localDir->AppendRelativeNativePath(DEFAULT_PRODUCT_DIR);
++
+   if (NS_FAILED(rv)) {
+     return rv;
+   }
++#endif
++
+   rv = localDir->Exists(&exists);
+ 
+   if (NS_SUCCEEDED(rv) && !exists) {
+@@ -323,7 +384,7 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile,
+ // GetDefaultUserProfileRoot - Gets the directory which contains each user
+ // profile dir
+ //
+-// UNIX   : ~/.mozilla/
++// UNIX   : ~/.mozilla/ or ${XDG_DATA_HOME:-~/.local/share}/mozilla
+ // WIN    : <Application Data folder on user's machine>\Mozilla\Profiles
+ // Mac    : :Documents:Mozilla:Profiles:
+ //----------------------------------------------------------------------------------------
diff --git a/nixpkgs-overlays/patches/firefox/nightly/D6695.diff b/nixpkgs-overlays/patches/firefox/nightly/D6695.diff
new file mode 100644
index 000000000000..31a08471a8cc
--- /dev/null
+++ b/nixpkgs-overlays/patches/firefox/nightly/D6695.diff
@@ -0,0 +1,159 @@
+--- a/toolkit/xre/nsXREDirProvider.cpp
++++ b/toolkit/xre/nsXREDirProvider.cpp
+@@ -390,13 +390,6 @@ nsXREDirProvider::GetFile(const char* aProperty, bool* aPersistent,
+     nsCOMPtr<nsIFile> localDir;
+     rv = GetUserDataDirectoryHome(getter_AddRefs(localDir), false);
+     if (NS_SUCCEEDED(rv)) {
+-#if defined(XP_MACOSX)
+-      rv = localDir->AppendNative(NS_LITERAL_CSTRING("Mozilla"));
+-#else
+-      rv = localDir->AppendNative(NS_LITERAL_CSTRING(".mozilla"));
+-#endif
+-    }
+-    if (NS_SUCCEEDED(rv)) {
+       localDir.swap(file);
+     }
+   }
+@@ -1249,8 +1242,6 @@ nsresult nsXREDirProvider::GetUpdateRootDir(nsIFile** aResult,
+             nsDependentCString(hasVendor ? GetAppVendor() : GetAppName())))) {
+       return NS_ERROR_FAILURE;
+     }
+-  } else if (NS_FAILED(localDir->AppendNative(NS_LITERAL_CSTRING("Mozilla")))) {
+-    return NS_ERROR_FAILURE;
+   }
+
+   if (NS_FAILED(localDir->Append(NS_LITERAL_STRING("updates"))) ||
+@@ -1378,6 +1369,9 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
+   NS_ENSURE_SUCCESS(rv, rv);
+
+   localDir = dirFileMac;
++
++  rv = localDir->AppendRelativeNativePath(nsDependentCString("Mozilla"));
++  NS_ENSURE_SUCCESS(rv, rv);
+ #elif defined(XP_IOS)
+   nsAutoCString userDir;
+   if (GetUIKitDirectory(aLocal, userDir)) {
+@@ -1401,6 +1395,9 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
+   NS_ENSURE_SUCCESS(rv, rv);
+
+   rv = NS_NewLocalFile(path, true, getter_AddRefs(localDir));
++  NS_ENSURE_SUCCESS(rv, rv);
++  rv = localDir->AppendRelativeNativePath(nsDependentCString("Mozilla"));
++  NS_ENSURE_SUCCESS(rv, rv);
+ #elif defined(XP_UNIX)
+   const char* homeDir = getenv("HOME");
+   if (!homeDir || !*homeDir) return NS_ERROR_FAILURE;
+@@ -1422,8 +1419,51 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
+         rv = localDir->AppendNative(NS_LITERAL_CSTRING(".cache"));
+     }
+   } else {
++    bool exists;
++    /* check old config ~/.mozilla */
+     rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true,
+                                getter_AddRefs(localDir));
++    NS_ENSURE_SUCCESS(rv, rv);
++    rv = localDir->AppendRelativeNativePath(nsDependentCString(".mozilla"));
++    NS_ENSURE_SUCCESS(rv, rv);
++    rv = localDir->Exists(&exists);
++    NS_ENSURE_SUCCESS(rv, rv);
++    /* otherwise, use new config */
++    if (!exists) {
++      const char* xdghomedir = getenv("XDG_DATA_HOME");
++      if (!xdghomedir || !*xdghomedir) {
++        rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true,
++                                   getter_AddRefs(localDir));
++        NS_ENSURE_SUCCESS(rv, rv);
++        rv = localDir->AppendRelativeNativePath(nsDependentCString(".local"));
++        NS_ENSURE_SUCCESS(rv, rv);
++        rv = localDir->Exists(&exists);
++        if (NS_SUCCEEDED(rv) && !exists) {
++          rv = localDir->Create(nsIFile::DIRECTORY_TYPE, 0755);
++          NS_ENSURE_SUCCESS(rv, rv);
++        }
++        rv = localDir->AppendRelativeNativePath(nsDependentCString("share"));
++        NS_ENSURE_SUCCESS(rv, rv);
++        rv = localDir->Exists(&exists);
++        if (NS_SUCCEEDED(rv) && !exists) {
++          rv = localDir->Create(nsIFile::DIRECTORY_TYPE, 0755);
++        }
++      }
++      else {
++        rv = NS_NewNativeLocalFile(nsDependentCString(xdghomedir), true,
++                               getter_AddRefs(localDir));
++      }
++      NS_ENSURE_SUCCESS(rv, rv);
++
++      rv = localDir->AppendRelativeNativePath(nsDependentCString("mozilla"));
++      NS_ENSURE_SUCCESS(rv, rv);
++      rv = localDir->Exists(&exists);
++      NS_ENSURE_SUCCESS(rv, rv);
++      if (NS_SUCCEEDED(rv) && !exists) {
++        rv = localDir->Create(nsIFile::DIRECTORY_TYPE, 0700);
++        NS_ENSURE_SUCCESS(rv, rv);
++      }
++    }
+   }
+ #else
+ #error "Don't know how to get product dir on your platform"
+@@ -1534,20 +1574,12 @@ nsresult nsXREDirProvider::AppendSysUserExtensionPath(nsIFile* aFile) {
+
+ #if defined(XP_MACOSX) || defined(XP_WIN)
+
+-  static const char* const sXR = "Mozilla";
+-  rv = aFile->AppendNative(nsDependentCString(sXR));
+-  NS_ENSURE_SUCCESS(rv, rv);
+-
+   static const char* const sExtensions = "Extensions";
+   rv = aFile->AppendNative(nsDependentCString(sExtensions));
+   NS_ENSURE_SUCCESS(rv, rv);
+
+ #elif defined(XP_UNIX)
+
+-  static const char* const sXR = ".mozilla";
+-  rv = aFile->AppendNative(nsDependentCString(sXR));
+-  NS_ENSURE_SUCCESS(rv, rv);
+-
+   static const char* const sExtensions = "extensions";
+   rv = aFile->AppendNative(nsDependentCString(sExtensions));
+   NS_ENSURE_SUCCESS(rv, rv);
+@@ -1565,20 +1597,12 @@ nsresult nsXREDirProvider::AppendSysUserExtensionsDevPath(nsIFile* aFile) {
+
+ #if defined(XP_MACOSX) || defined(XP_WIN)
+
+-  static const char* const sXR = "Mozilla";
+-  rv = aFile->AppendNative(nsDependentCString(sXR));
+-  NS_ENSURE_SUCCESS(rv, rv);
+-
+   static const char* const sExtensions = "SystemExtensionsDev";
+   rv = aFile->AppendNative(nsDependentCString(sExtensions));
+   NS_ENSURE_SUCCESS(rv, rv);
+
+ #elif defined(XP_UNIX)
+
+-  static const char* const sXR = ".mozilla";
+-  rv = aFile->AppendNative(nsDependentCString(sXR));
+-  NS_ENSURE_SUCCESS(rv, rv);
+-
+   static const char* const sExtensions = "systemextensionsdev";
+   rv = aFile->AppendNative(nsDependentCString(sExtensions));
+   NS_ENSURE_SUCCESS(rv, rv);
+@@ -1636,9 +1660,6 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) {
+   NS_ENSURE_SUCCESS(rv, rv);
+ #elif defined(XP_UNIX)
+   nsAutoCString folder;
+-  // Make it hidden (by starting with "."), except when local (the
+-  // profile is already under ~/.cache or XDG_CACHE_HOME).
+-  if (!aLocal) folder.Assign('.');
+
+   if (!profile.IsEmpty()) {
+     // Skip any leading path characters
+@@ -1658,9 +1679,6 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) {
+       folder.Append(vendor);
+       ToLowerCase(folder);
+
+-      rv = aFile->AppendNative(folder);
+-      NS_ENSURE_SUCCESS(rv, rv);
+-
+       folder.Truncate();
+     }
+
diff --git a/nixpkgs-overlays/patches/firefox/packages.nix b/nixpkgs-overlays/patches/firefox/packages.nix
new file mode 100644
index 000000000000..aac5c2eb5c50
--- /dev/null
+++ b/nixpkgs-overlays/patches/firefox/packages.nix
@@ -0,0 +1,17 @@
+{ firefoxPackages }:
+
+with firefoxPackages;
+
+firefoxPackages // {
+  firefox = firefox.overrideAttrs ({ patches ? [], ... }: {
+    patches = patches ++ [ release/D6695.diff ];
+  });
+
+  firefox-beta = firefox-beta.overrideAttrs ({ patches ? [], ... }: {
+    patches = patches ++ [ beta/D6695.diff ];
+  });
+
+  firefox-nightly = firefox-nightly.overrideAttrs ({ patches ? [], ... }: {
+    patches = patches ++ [ nightly/D6695.diff ];
+  });
+}
diff --git a/nixpkgs-overlays/patches/firefox/profiles.ini b/nixpkgs-overlays/patches/firefox/profiles.ini
new file mode 100644
index 000000000000..becf53354e76
--- /dev/null
+++ b/nixpkgs-overlays/patches/firefox/profiles.ini
@@ -0,0 +1,8 @@
+[General]
+StartWithLastProfile=1
+
+[Profile0]
+Name=default
+IsRelative=1
+Path=default
+Default=1
diff --git a/nixpkgs-overlays/patches/firefox/release/D6695.diff b/nixpkgs-overlays/patches/firefox/release/D6695.diff
new file mode 100644
index 000000000000..f75df56ddd34
--- /dev/null
+++ b/nixpkgs-overlays/patches/firefox/release/D6695.diff
@@ -0,0 +1,281 @@
+diff --git a/toolkit/moz.build b/toolkit/moz.build
+index 109fb2ce9369..0b871d931038 100644
+--- a/toolkit/moz.build
++++ b/toolkit/moz.build
+@@ -72,2 +72,5 @@ with Files('mozapps/preferences/**'):
+ with Files('pluginproblem/**'):
+     BUG_COMPONENT = ('Core', 'Plug-ins')
++
++if CONFIG['ENABLE_TESTS']:
++    DIRS += ['tests/gtest']
+diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
+index a094e318d6f1..63f9efc9e77a 100644
+--- a/toolkit/xre/nsXREDirProvider.cpp
++++ b/toolkit/xre/nsXREDirProvider.cpp
+@@ -385,13 +385,6 @@ nsXREDirProvider::GetFile(const char* aProperty, bool* aPersistent,
+     nsCOMPtr<nsIFile> localDir;
+     rv = GetUserDataDirectoryHome(getter_AddRefs(localDir), false);
+     if (NS_SUCCEEDED(rv)) {
+-#  if defined(XP_MACOSX)
+-      rv = localDir->AppendNative(NS_LITERAL_CSTRING("Mozilla"));
+-#  else
+-      rv = localDir->AppendNative(NS_LITERAL_CSTRING(".mozilla"));
+-#  endif
+-    }
+-    if (NS_SUCCEEDED(rv)) {
+       localDir.swap(file);
+     }
+   }
+@@ -1244,7 +1237,8 @@ nsresult nsXREDirProvider::GetUpdateRootDir(nsIFile** aResult,
+             nsDependentCString(hasVendor ? GetAppVendor() : GetAppName())))) {
+       return NS_ERROR_FAILURE;
+     }
+-  } else if (NS_FAILED(localDir->AppendNative(NS_LITERAL_CSTRING("Mozilla")))) {
++  }
++  else if (NS_FAILED(localDir->AppendNative(NS_LITERAL_CSTRING("Mozilla")))) {
+     return NS_ERROR_FAILURE;
+   }
+ 
+@@ -1373,6 +1367,9 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
+   NS_ENSURE_SUCCESS(rv, rv);
+ 
+   localDir = dirFileMac;
++
++  rv = localDir->AppendRelativeNativePath(nsDependentCString("Mozilla"));
++  NS_ENSURE_SUCCESS(rv, rv);
+ #elif defined(XP_IOS)
+   nsAutoCString userDir;
+   if (GetUIKitDirectory(aLocal, userDir)) {
+@@ -1396,6 +1393,9 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
+   NS_ENSURE_SUCCESS(rv, rv);
+ 
+   rv = NS_NewLocalFile(path, true, getter_AddRefs(localDir));
++  NS_ENSURE_SUCCESS(rv, rv);
++  rv = localDir->AppendRelativeNativePath(nsDependentCString("Mozilla"));
++  NS_ENSURE_SUCCESS(rv, rv);
+ #elif defined(XP_UNIX)
+   const char* homeDir = getenv("HOME");
+   if (!homeDir || !*homeDir) return NS_ERROR_FAILURE;
+@@ -1417,8 +1417,51 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
+         rv = localDir->AppendNative(NS_LITERAL_CSTRING(".cache"));
+     }
+   } else {
++    bool exists;
++    // check old config ~/.mozilla
+     rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true,
+                                getter_AddRefs(localDir));
++    NS_ENSURE_SUCCESS(rv, rv);
++    rv = localDir->AppendRelativeNativePath(nsDependentCString(".mozilla"));
++    NS_ENSURE_SUCCESS(rv, rv);
++    rv = localDir->Exists(&exists);
++    NS_ENSURE_SUCCESS(rv, rv);
++    // otherwise, use new config
++    if (!exists) {
++      const char* xdghomedir = getenv("XDG_DATA_HOME");
++      if (!xdghomedir || !*xdghomedir) {
++        rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true,
++                                   getter_AddRefs(localDir));
++        NS_ENSURE_SUCCESS(rv, rv);
++        rv = localDir->AppendRelativeNativePath(nsDependentCString(".local"));
++        NS_ENSURE_SUCCESS(rv, rv);
++        rv = localDir->Exists(&exists);
++        if (NS_SUCCEEDED(rv) && !exists) {
++          rv = localDir->Create(nsIFile::DIRECTORY_TYPE, 0755);
++          NS_ENSURE_SUCCESS(rv, rv);
++        }
++        rv = localDir->AppendRelativeNativePath(nsDependentCString("share"));
++        NS_ENSURE_SUCCESS(rv, rv);
++        rv = localDir->Exists(&exists);
++        if (NS_SUCCEEDED(rv) && !exists) {
++          rv = localDir->Create(nsIFile::DIRECTORY_TYPE, 0755);
++        }
++      }
++      else {
++        rv = NS_NewNativeLocalFile(nsDependentCString(xdghomedir), true,
++                               getter_AddRefs(localDir));
++      }
++      NS_ENSURE_SUCCESS(rv, rv);
++
++      rv = localDir->AppendRelativeNativePath(nsDependentCString("mozilla"));
++      NS_ENSURE_SUCCESS(rv, rv);
++      rv = localDir->Exists(&exists);
++      NS_ENSURE_SUCCESS(rv, rv);
++      if (NS_SUCCEEDED(rv) && !exists) {
++        rv = localDir->Create(nsIFile::DIRECTORY_TYPE, 0700);
++        NS_ENSURE_SUCCESS(rv, rv);
++      }
++    }
+   }
+ #else
+ #  error "Don't know how to get product dir on your platform"
+@@ -1545,20 +1588,12 @@ nsresult nsXREDirProvider::AppendSysUserExtensionPath(nsIFile* aFile) {
+ 
+ #if defined(XP_MACOSX) || defined(XP_WIN)
+ 
+-  static const char* const sXR = "Mozilla";
+-  rv = aFile->AppendNative(nsDependentCString(sXR));
+-  NS_ENSURE_SUCCESS(rv, rv);
+-
+   static const char* const sExtensions = "Extensions";
+   rv = aFile->AppendNative(nsDependentCString(sExtensions));
+   NS_ENSURE_SUCCESS(rv, rv);
+ 
+ #elif defined(XP_UNIX)
+ 
+-  static const char* const sXR = ".mozilla";
+-  rv = aFile->AppendNative(nsDependentCString(sXR));
+-  NS_ENSURE_SUCCESS(rv, rv);
+-
+   static const char* const sExtensions = "extensions";
+   rv = aFile->AppendNative(nsDependentCString(sExtensions));
+   NS_ENSURE_SUCCESS(rv, rv);
+@@ -1576,20 +1611,12 @@ nsresult nsXREDirProvider::AppendSysUserExtensionsDevPath(nsIFile* aFile) {
+ 
+ #if defined(XP_MACOSX) || defined(XP_WIN)
+ 
+-  static const char* const sXR = "Mozilla";
+-  rv = aFile->AppendNative(nsDependentCString(sXR));
+-  NS_ENSURE_SUCCESS(rv, rv);
+-
+   static const char* const sExtensions = "SystemExtensionsDev";
+   rv = aFile->AppendNative(nsDependentCString(sExtensions));
+   NS_ENSURE_SUCCESS(rv, rv);
+ 
+ #elif defined(XP_UNIX)
+ 
+-  static const char* const sXR = ".mozilla";
+-  rv = aFile->AppendNative(nsDependentCString(sXR));
+-  NS_ENSURE_SUCCESS(rv, rv);
+-
+   static const char* const sExtensions = "systemextensionsdev";
+   rv = aFile->AppendNative(nsDependentCString(sExtensions));
+   NS_ENSURE_SUCCESS(rv, rv);
+@@ -1654,9 +1681,6 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) {
+   NS_ENSURE_SUCCESS(rv, rv);
+ #elif defined(XP_UNIX)
+   nsAutoCString folder;
+-  // Make it hidden (by starting with "."), except when local (the
+-  // profile is already under ~/.cache or XDG_CACHE_HOME).
+-  if (!aLocal) folder.Assign('.');
+ 
+   if (!profile.IsEmpty()) {
+     // Skip any leading path characters
+@@ -1676,8 +1700,12 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) {
+       folder.Append(vendor);
+       ToLowerCase(folder);
+ 
+-      rv = aFile->AppendNative(folder);
+-      NS_ENSURE_SUCCESS(rv, rv);
++      // Keep the 'mozilla' path for cache:
++      // Use ${XDG_DATA_HOME:-$HOME/.cache}/mozilla/firefox
++      if (aLocal) {
++        rv = aFile->AppendNative(folder);
++        NS_ENSURE_SUCCESS(rv, rv);
++      }
+ 
+       folder.Truncate();
+     }
+diff --git a/xpcom/io/nsAppFileLocationProvider.cpp b/xpcom/io/nsAppFileLocationProvider.cpp
+index e79c8303fe12..53c550db18c0 100644
+--- a/xpcom/io/nsAppFileLocationProvider.cpp
++++ b/xpcom/io/nsAppFileLocationProvider.cpp
+@@ -247,7 +247,7 @@ nsresult nsAppFileLocationProvider::CloneMozBinDirectory(nsIFile** aLocalFile) {
+ // GetProductDirectory - Gets the directory which contains the application data
+ // folder
+ //
+-// UNIX   : ~/.mozilla/
++// UNIX   : ~/.mozilla/ or ${XDG_DATA_HOME:-~/.local/share}/mozilla
+ // WIN    : <Application Data folder on user's machine>\Mozilla
+ // Mac    : :Documents:Mozilla:
+ //----------------------------------------------------------------------------------------
+@@ -291,19 +291,80 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile,
+     return rv;
+   }
+ #elif defined(XP_UNIX)
+-  rv = NS_NewNativeLocalFile(nsDependentCString(PR_GetEnv("HOME")), true,
++  const char* homeDir = PR_GetEnv("HOME");
++  /* check old config ~/.mozilla */
++  rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true,
+                              getter_AddRefs(localDir));
+   if (NS_FAILED(rv)) {
+     return rv;
+   }
++  rv = localDir->AppendRelativeNativePath(nsDependentCString(".mozilla"));
++  if (NS_FAILED(rv)) {
++    return rv;
++  }
++  rv = localDir->Exists(&exists);
++  if (NS_FAILED(rv)) {
++    return rv;
++  }
++  /* otherwise, use new config */
++  if (!exists) {
++    const char* xdghomedir = PR_GetEnv("XDG_DATA_HOME");
++    if (!xdghomedir || !*xdghomedir) {
++      /* XDG_DATA_HOME=$HOME/.local/share */
++      rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true,
++                                 getter_AddRefs(localDir));
++      if (NS_FAILED(rv)) {
++        return rv;
++      }
++      rv = localDir->AppendRelativeNativePath(nsDependentCString(".local"));
++      if (NS_FAILED(rv)) {
++        return rv;
++      }
++      rv = localDir->Exists(&exists);
++      if (NS_SUCCEEDED(rv) && !exists) {
++        rv = localDir->Create(nsIFile::DIRECTORY_TYPE, 0755);
++        if (NS_FAILED(rv)) {
++          return rv;
++        }
++      }
++      rv = localDir->AppendRelativeNativePath(nsDependentCString("share"));
++      if (NS_FAILED(rv)) {
++        return rv;
++      }
++      rv = localDir->Exists(&exists);
++      if (NS_SUCCEEDED(rv) && !exists) {
++        rv = localDir->Create(nsIFile::DIRECTORY_TYPE, 0755);
++      }
++    }
++    else {
++      rv = NS_NewNativeLocalFile(nsDependentCString(xdghomedir), true,
++                                 getter_AddRefs(localDir));
++    }
++    if (NS_FAILED(rv)) {
++      return rv;
++    }
++    rv = localDir->AppendRelativeNativePath(nsDependentCString("mozilla"));
++    if (NS_FAILED(rv)) {
++      return rv;
++    }
++  }
+ #else
+ #  error dont_know_how_to_get_product_dir_on_your_platform
+ #endif
+ 
++#if !defined(XP_UNIX) || defined(XP_MACOSX)
++  // Since we have to check for legacy configuration, we have
++  // the complete path for Linux already, so this is not
++  // needed. If we stop checking for legacy at some point,
++  // then we can change this to not be protected by
++  // this clause.
+   rv = localDir->AppendRelativeNativePath(DEFAULT_PRODUCT_DIR);
++
+   if (NS_FAILED(rv)) {
+     return rv;
+   }
++#endif
++
+   rv = localDir->Exists(&exists);
+ 
+   if (NS_SUCCEEDED(rv) && !exists) {
+@@ -323,7 +384,7 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile,
+ // GetDefaultUserProfileRoot - Gets the directory which contains each user
+ // profile dir
+ //
+-// UNIX   : ~/.mozilla/
++// UNIX   : ~/.mozilla/ or ${XDG_DATA_HOME:-~/.local/share}/mozilla
+ // WIN    : <Application Data folder on user's machine>\Mozilla\Profiles
+ // Mac    : :Documents:Mozilla:Profiles:
+ //----------------------------------------------------------------------------------------
diff --git a/nixpkgs-overlays/patches/firefox/user.js b/nixpkgs-overlays/patches/firefox/user.js
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/nixpkgs-overlays/patches/firefox/user.js
@@ -0,0 +1 @@
+
diff --git a/nixpkgs-overlays/patches/neomutt/1388.patch b/nixpkgs-overlays/patches/neomutt/1388.patch
new file mode 100644
index 000000000000..581c4e2b4af9
--- /dev/null
+++ b/nixpkgs-overlays/patches/neomutt/1388.patch
@@ -0,0 +1,29 @@
+From aaee4ae3272416ad0d66a4984f3398552df13cef Mon Sep 17 00:00:00 2001
+From: Alyssa Ross <hi@alyssa.is>
+Date: Sun, 4 Nov 2018 17:01:05 +0000
+Subject: [PATCH] Work around mutt_expando_format buffer overflow
+
+This doesn't actually fix the overflow, but at least makes it less
+likely to be encountered.
+
+See https://github.com/neomutt/neomutt/issues/1388.
+---
+ muttlib.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/muttlib.c b/muttlib.c
+index 431d759b9..1498c5a45 100644
+--- a/muttlib.c
++++ b/muttlib.c
+@@ -773,7 +773,7 @@ void mutt_expando_format(char *buf, size_t buflen, size_t col, int cols, const c
+   FILE *filter = NULL;
+   char *recycler = NULL;
+ 
+-  char src2[STRING];
++  char src2[LONG_STRING];
+   mutt_str_strfcpy(src2, src, mutt_str_strlen(src) + 1);
+   src = src2;
+ 
+-- 
+2.19.1
+
diff --git a/nixpkgs-overlays/patches/neomutt/default.nix b/nixpkgs-overlays/patches/neomutt/default.nix
new file mode 100644
index 000000000000..f62ba785a182
--- /dev/null
+++ b/nixpkgs-overlays/patches/neomutt/default.nix
@@ -0,0 +1,5 @@
+{ neomutt }:
+
+neomutt.overrideAttrs (oldAttrs: {
+  patches = (oldAttrs.patches or []) ++ [ ./1388.patch ];
+})
diff --git a/nixpkgs-overlays/patches/tmux/default.nix b/nixpkgs-overlays/patches/tmux/default.nix
new file mode 100644
index 000000000000..54ad974cef3c
--- /dev/null
+++ b/nixpkgs-overlays/patches/tmux/default.nix
@@ -0,0 +1,10 @@
+{ fetchpatch, tmux }:
+
+tmux.overrideAttrs ({ patches ? [], ... }: {
+  patches = patches ++ [
+    (fetchpatch {
+      url = https://github.com/tmux/tmux/pull/1144.patch;
+      sha256 = "0zg1q2n23vfiiwi5l54k8kn7k2p1xdh11cw7pyzjl44jpqzqwvaq";
+    })
+  ];
+})
diff --git a/nixpkgs-overlays/scripts/choose/choose.in b/nixpkgs-overlays/scripts/choose/choose.in
new file mode 100644
index 000000000000..7f60b47386a3
--- /dev/null
+++ b/nixpkgs-overlays/scripts/choose/choose.in
@@ -0,0 +1,20 @@
+#! @execline@/bin/execlineb -S0
+
+define -s fzf_opts "--reverse"
+
+ifelse { importas -i _ DISPLAY }
+{
+  alacritty --class float -e
+  getpid my_pid
+  importas -i -u my_pid my_pid
+  backtick -i -n term_pid { awk "{print $4}" /proc/${my_pid}/stat }
+  importas -i -u term_pid term_pid
+  redirfd -r 0 /proc/${term_pid}/fd/0
+  redirfd -w 1 /proc/${term_pid}/fd/1
+  @fzf@/bin/fzf $fzf_opts $@
+}
+
+ifelse { importas -i _ TMUX }
+{ @fzf@/bin/fzf-tmux $fzf_opts $@ }
+
+@fzf@/bin/fzf $fzf_opts $@
diff --git a/nixpkgs-overlays/scripts/choose/choosebin.in b/nixpkgs-overlays/scripts/choose/choosebin.in
new file mode 100644
index 000000000000..7f8ea520c994
--- /dev/null
+++ b/nixpkgs-overlays/scripts/choose/choosebin.in
@@ -0,0 +1,17 @@
+#! @execline@/bin/execlineb -S0
+
+backtick -i entry_points {
+  importas PATH PATH
+  heredoc 0 $PATH
+  tr : " "
+}
+importas -s -i -u entry_points entry_points
+
+pipeline {
+  redirfd -w 2 /dev/null
+  find -L $entry_points -mindepth 1 -maxdepth 1 -executable -type f
+}
+
+pipeline { awk -F / "{print $NF}" }
+
+@out@/bin/choose --prompt "$ " $@
diff --git a/nixpkgs-overlays/scripts/choose/default.nix b/nixpkgs-overlays/scripts/choose/default.nix
new file mode 100644
index 000000000000..d4e845f8b967
--- /dev/null
+++ b/nixpkgs-overlays/scripts/choose/default.nix
@@ -0,0 +1,8 @@
+{ runCommand, makeWrapper, execline, fzf }:
+
+runCommand "choose" { inherit execline fzf; } ''
+  install -d $out/bin
+  substituteAll ${./choose.in} $out/bin/choose
+  substituteAll ${./choosebin.in} $out/bin/choosebin
+  chmod +x $out/bin/*
+''
diff --git a/nixpkgs-overlays/scripts/default.nix b/nixpkgs-overlays/scripts/default.nix
new file mode 100644
index 000000000000..983d32d867a4
--- /dev/null
+++ b/nixpkgs-overlays/scripts/default.nix
@@ -0,0 +1,3 @@
+self: super: {
+  choose = self.callPackage ./choose { };
+}
diff --git a/.editorconfig b/nixpkgs/.editorconfig
index f272739f240a..f272739f240a 100644
--- a/.editorconfig
+++ b/nixpkgs/.editorconfig
diff --git a/.gitattributes b/nixpkgs/.gitattributes
index 4862e0eab93c..4862e0eab93c 100644
--- a/.gitattributes
+++ b/nixpkgs/.gitattributes
diff --git a/.github/CODEOWNERS b/nixpkgs/.github/CODEOWNERS
index 1027ccc9cbad..1027ccc9cbad 100644
--- a/.github/CODEOWNERS
+++ b/nixpkgs/.github/CODEOWNERS
diff --git a/.github/CONTRIBUTING.md b/nixpkgs/.github/CONTRIBUTING.md
index 07eddc80c253..07eddc80c253 100644
--- a/.github/CONTRIBUTING.md
+++ b/nixpkgs/.github/CONTRIBUTING.md
diff --git a/.github/FUNDING.yml b/nixpkgs/.github/FUNDING.yml
index bbaabf93c7a9..bbaabf93c7a9 100644
--- a/.github/FUNDING.yml
+++ b/nixpkgs/.github/FUNDING.yml
diff --git a/.github/ISSUE_TEMPLATE.md b/nixpkgs/.github/ISSUE_TEMPLATE.md
index 466d8d2c359e..466d8d2c359e 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/nixpkgs/.github/ISSUE_TEMPLATE.md
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md
index 5e8b84f3ce8e..5e8b84f3ce8e 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/nixpkgs/.gitignore b/nixpkgs/.gitignore
new file mode 100644
index 000000000000..b3ae9e6ea863
--- /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 ba19dc3bb41e..ba19dc3bb41e 100644
--- a/.version
+++ b/nixpkgs/.version
diff --git a/nixpkgs/COPYING b/nixpkgs/COPYING
new file mode 100644
index 000000000000..9a73903d6df1
--- /dev/null
+++ b/nixpkgs/COPYING
@@ -0,0 +1,20 @@
+Copyright (c) 2003-2019 Eelco Dolstra and the Nixpkgs/NixOS 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/README.md b/nixpkgs/README.md
index 8cdbb73595bf..8cdbb73595bf 100644
--- a/README.md
+++ b/nixpkgs/README.md
diff --git a/nixpkgs/default.nix b/nixpkgs/default.nix
new file mode 100644
index 000000000000..a74a01719c73
--- /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 b5c58be03d15..b5c58be03d15 100644
--- a/doc/.gitignore
+++ b/nixpkgs/doc/.gitignore
diff --git a/doc/Makefile b/nixpkgs/doc/Makefile
index e7ca31b20d71..e7ca31b20d71 100644
--- a/doc/Makefile
+++ b/nixpkgs/doc/Makefile
diff --git a/doc/coding-conventions.xml b/nixpkgs/doc/coding-conventions.xml
index 48356247a49e..48356247a49e 100644
--- a/doc/coding-conventions.xml
+++ b/nixpkgs/doc/coding-conventions.xml
diff --git a/doc/configuration.xml b/nixpkgs/doc/configuration.xml
index b497fa4e2722..b497fa4e2722 100644
--- a/doc/configuration.xml
+++ b/nixpkgs/doc/configuration.xml
diff --git a/doc/contributing.xml b/nixpkgs/doc/contributing.xml
index 523c1c9c8f03..523c1c9c8f03 100644
--- a/doc/contributing.xml
+++ b/nixpkgs/doc/contributing.xml
diff --git a/doc/cross-compilation.xml b/nixpkgs/doc/cross-compilation.xml
index b7844da195d7..b7844da195d7 100644
--- a/doc/cross-compilation.xml
+++ b/nixpkgs/doc/cross-compilation.xml
diff --git a/doc/default.nix b/nixpkgs/doc/default.nix
index d9051167dee5..d9051167dee5 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 53990b677196..53990b677196 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 5199b949e7b8..5199b949e7b8 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 ae7036e46264..ae7036e46264 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 bc13e2b70dec..bc13e2b70dec 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 3b60f46d81da..3b60f46d81da 100644
--- a/doc/functions.xml
+++ b/nixpkgs/doc/functions.xml
diff --git a/doc/functions/appimagetools.xml b/nixpkgs/doc/functions/appimagetools.xml
index e6dbc22f48dd..e6dbc22f48dd 100644
--- a/doc/functions/appimagetools.xml
+++ b/nixpkgs/doc/functions/appimagetools.xml
diff --git a/doc/functions/debug.xml b/nixpkgs/doc/functions/debug.xml
index c6b3611eea53..c6b3611eea53 100644
--- a/doc/functions/debug.xml
+++ b/nixpkgs/doc/functions/debug.xml
diff --git a/doc/functions/dockertools.xml b/nixpkgs/doc/functions/dockertools.xml
index 3e9281557d51..3e9281557d51 100644
--- a/doc/functions/dockertools.xml
+++ b/nixpkgs/doc/functions/dockertools.xml
diff --git a/doc/functions/fetchers.xml b/nixpkgs/doc/functions/fetchers.xml
index a736008c9d41..a736008c9d41 100644
--- a/doc/functions/fetchers.xml
+++ b/nixpkgs/doc/functions/fetchers.xml
diff --git a/doc/functions/fhs-environments.xml b/nixpkgs/doc/functions/fhs-environments.xml
index 79682080be31..79682080be31 100644
--- a/doc/functions/fhs-environments.xml
+++ b/nixpkgs/doc/functions/fhs-environments.xml
diff --git a/doc/functions/generators.xml b/nixpkgs/doc/functions/generators.xml
index e860b10e8979..e860b10e8979 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 e6aedaa6efdd..e6aedaa6efdd 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 437850e408bc..437850e408bc 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 65d0b40e2e82..65d0b40e2e82 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 9011570d1eae..9011570d1eae 100644
--- a/doc/functions/nix-gitignore.xml
+++ b/nixpkgs/doc/functions/nix-gitignore.xml
diff --git a/doc/functions/overrides.xml b/nixpkgs/doc/functions/overrides.xml
index 1bd90d2a0c76..1bd90d2a0c76 100644
--- a/doc/functions/overrides.xml
+++ b/nixpkgs/doc/functions/overrides.xml
diff --git a/doc/functions/prefer-remote-fetch.xml b/nixpkgs/doc/functions/prefer-remote-fetch.xml
index 3e43fd28ade8..3e43fd28ade8 100644
--- a/doc/functions/prefer-remote-fetch.xml
+++ b/nixpkgs/doc/functions/prefer-remote-fetch.xml
diff --git a/doc/functions/shell.xml b/nixpkgs/doc/functions/shell.xml
index e5031c9463c0..e5031c9463c0 100644
--- a/doc/functions/shell.xml
+++ b/nixpkgs/doc/functions/shell.xml
diff --git a/doc/functions/snap/example-firefox.nix b/nixpkgs/doc/functions/snap/example-firefox.nix
index d58c98a65a2e..d58c98a65a2e 100644
--- a/doc/functions/snap/example-firefox.nix
+++ b/nixpkgs/doc/functions/snap/example-firefox.nix
diff --git a/doc/functions/snap/example-hello.nix b/nixpkgs/doc/functions/snap/example-hello.nix
index 123da80c5477..123da80c5477 100644
--- a/doc/functions/snap/example-hello.nix
+++ b/nixpkgs/doc/functions/snap/example-hello.nix
diff --git a/doc/functions/snaptools.xml b/nixpkgs/doc/functions/snaptools.xml
index d0e3efdf6c67..d0e3efdf6c67 100644
--- a/doc/functions/snaptools.xml
+++ b/nixpkgs/doc/functions/snaptools.xml
diff --git a/doc/functions/trivial-builders.xml b/nixpkgs/doc/functions/trivial-builders.xml
index 0211a4f31728..0211a4f31728 100644
--- a/doc/functions/trivial-builders.xml
+++ b/nixpkgs/doc/functions/trivial-builders.xml
diff --git a/doc/introduction.chapter.md b/nixpkgs/doc/introduction.chapter.md
index 6abdc2714e2c..6abdc2714e2c 100644
--- a/doc/introduction.chapter.md
+++ b/nixpkgs/doc/introduction.chapter.md
diff --git a/doc/languages-frameworks/android.section.md b/nixpkgs/doc/languages-frameworks/android.section.md
index 237f3441874f..237f3441874f 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 dee7f2d74191..dee7f2d74191 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 118f6e10473a..118f6e10473a 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 4314df5c9df2..4314df5c9df2 100644
--- a/doc/languages-frameworks/coq.xml
+++ b/nixpkgs/doc/languages-frameworks/coq.xml
diff --git a/doc/languages-frameworks/emscripten.section.md b/nixpkgs/doc/languages-frameworks/emscripten.section.md
index 24c49ec1409c..24c49ec1409c 100644
--- a/doc/languages-frameworks/emscripten.section.md
+++ b/nixpkgs/doc/languages-frameworks/emscripten.section.md
diff --git a/doc/languages-frameworks/go.xml b/nixpkgs/doc/languages-frameworks/go.xml
index b2b4962cb5f6..b2b4962cb5f6 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 48d22831cd9b..48d22831cd9b 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 3025172b5c98..3025172b5c98 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 4564df98fe99..4564df98fe99 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 6684b809ffe6..6684b809ffe6 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 287f63e685c4..287f63e685c4 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 5144bb24ff6e..5144bb24ff6e 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 c6dce04c7b8b..c6dce04c7b8b 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 b7006ecba998..b7006ecba998 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 d0f124f29d42..d0f124f29d42 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 77b387dd3025..77b387dd3025 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 b9b605b81da1..b9b605b81da1 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 c8f02bd14780..c8f02bd14780 100644
--- a/doc/languages-frameworks/r.section.md
+++ b/nixpkgs/doc/languages-frameworks/r.section.md
diff --git a/doc/languages-frameworks/ruby.xml b/nixpkgs/doc/languages-frameworks/ruby.xml
index df4e5acb22cb..df4e5acb22cb 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 2d9338f2e89b..2d9338f2e89b 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 97f274933bef..97f274933bef 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 7a97664ec598..7a97664ec598 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 c450a09f7bd2..c450a09f7bd2 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 ab845e1a1086..ab845e1a1086 100644
--- a/doc/manual.xml
+++ b/nixpkgs/doc/manual.xml
diff --git a/doc/meta.xml b/nixpkgs/doc/meta.xml
index 58c390a68b84..58c390a68b84 100644
--- a/doc/meta.xml
+++ b/nixpkgs/doc/meta.xml
diff --git a/doc/multiple-output.xml b/nixpkgs/doc/multiple-output.xml
index d0247e081f99..d0247e081f99 100644
--- a/doc/multiple-output.xml
+++ b/nixpkgs/doc/multiple-output.xml
diff --git a/doc/old/cross.txt b/nixpkgs/doc/old/cross.txt
index ff9fefb04a86..ff9fefb04a86 100644
--- a/doc/old/cross.txt
+++ b/nixpkgs/doc/old/cross.txt
diff --git a/doc/overlays.xml b/nixpkgs/doc/overlays.xml
index bff2339ca933..bff2339ca933 100644
--- a/doc/overlays.xml
+++ b/nixpkgs/doc/overlays.xml
diff --git a/doc/overrides.css b/nixpkgs/doc/overrides.css
index 4c7d4a31be2d..4c7d4a31be2d 100644
--- a/doc/overrides.css
+++ b/nixpkgs/doc/overrides.css
diff --git a/doc/package-notes.xml b/nixpkgs/doc/package-notes.xml
index d2c660e22a9b..d2c660e22a9b 100644
--- a/doc/package-notes.xml
+++ b/nixpkgs/doc/package-notes.xml
diff --git a/doc/package-specific-user-notes.xml b/nixpkgs/doc/package-specific-user-notes.xml
index ef9198d1de29..ef9198d1de29 100644
--- a/doc/package-specific-user-notes.xml
+++ b/nixpkgs/doc/package-specific-user-notes.xml
diff --git a/doc/platform-notes.xml b/nixpkgs/doc/platform-notes.xml
index 157d3fe2fcdd..157d3fe2fcdd 100644
--- a/doc/platform-notes.xml
+++ b/nixpkgs/doc/platform-notes.xml
diff --git a/doc/quick-start.xml b/nixpkgs/doc/quick-start.xml
index 4f0952896e45..4f0952896e45 100644
--- a/doc/quick-start.xml
+++ b/nixpkgs/doc/quick-start.xml
diff --git a/doc/release-notes.xml b/nixpkgs/doc/release-notes.xml
index 8d9b1813010a..8d9b1813010a 100644
--- a/doc/release-notes.xml
+++ b/nixpkgs/doc/release-notes.xml
diff --git a/doc/reviewing-contributions.xml b/nixpkgs/doc/reviewing-contributions.xml
index 5aa950625efa..5aa950625efa 100644
--- a/doc/reviewing-contributions.xml
+++ b/nixpkgs/doc/reviewing-contributions.xml
diff --git a/doc/shell.nix b/nixpkgs/doc/shell.nix
index 8ac2019f9d66..8ac2019f9d66 100644
--- a/doc/shell.nix
+++ b/nixpkgs/doc/shell.nix
diff --git a/doc/stdenv.xml b/nixpkgs/doc/stdenv.xml
index fbb84b03a8d5..fbb84b03a8d5 100644
--- a/doc/stdenv.xml
+++ b/nixpkgs/doc/stdenv.xml
diff --git a/doc/style.css b/nixpkgs/doc/style.css
index 474dd32e3fb1..474dd32e3fb1 100644
--- a/doc/style.css
+++ b/nixpkgs/doc/style.css
diff --git a/doc/submitting-changes.xml b/nixpkgs/doc/submitting-changes.xml
index a04ec08b0484..a04ec08b0484 100644
--- a/doc/submitting-changes.xml
+++ b/nixpkgs/doc/submitting-changes.xml
diff --git a/lib/asserts.nix b/nixpkgs/lib/asserts.nix
index 8a5f1fb3feb7..8a5f1fb3feb7 100644
--- a/lib/asserts.nix
+++ b/nixpkgs/lib/asserts.nix
diff --git a/lib/attrsets.nix b/nixpkgs/lib/attrsets.nix
index d374d229f597..d374d229f597 100644
--- a/lib/attrsets.nix
+++ b/nixpkgs/lib/attrsets.nix
diff --git a/lib/customisation.nix b/nixpkgs/lib/customisation.nix
index 1f5eb0d11e8b..1f5eb0d11e8b 100644
--- a/lib/customisation.nix
+++ b/nixpkgs/lib/customisation.nix
diff --git a/lib/debug.nix b/nixpkgs/lib/debug.nix
index 2879f72ed2ba..2879f72ed2ba 100644
--- a/lib/debug.nix
+++ b/nixpkgs/lib/debug.nix
diff --git a/lib/default.nix b/nixpkgs/lib/default.nix
index 3efaaf0f8f9e..3efaaf0f8f9e 100644
--- a/lib/default.nix
+++ b/nixpkgs/lib/default.nix
diff --git a/lib/deprecated.nix b/nixpkgs/lib/deprecated.nix
index 15de50456612..15de50456612 100644
--- a/lib/deprecated.nix
+++ b/nixpkgs/lib/deprecated.nix
diff --git a/lib/fetchers.nix b/nixpkgs/lib/fetchers.nix
index 1107353b51dd..1107353b51dd 100644
--- a/lib/fetchers.nix
+++ b/nixpkgs/lib/fetchers.nix
diff --git a/lib/filesystem.nix b/nixpkgs/lib/filesystem.nix
index fc35a1a72c64..fc35a1a72c64 100644
--- a/lib/filesystem.nix
+++ b/nixpkgs/lib/filesystem.nix
diff --git a/lib/fixed-points.nix b/nixpkgs/lib/fixed-points.nix
index 968930526a63..968930526a63 100644
--- a/lib/fixed-points.nix
+++ b/nixpkgs/lib/fixed-points.nix
diff --git a/lib/generators.nix b/nixpkgs/lib/generators.nix
index a71654bec6c3..a71654bec6c3 100644
--- a/lib/generators.nix
+++ b/nixpkgs/lib/generators.nix
diff --git a/lib/kernel.nix b/nixpkgs/lib/kernel.nix
index 5923011774b1..5923011774b1 100644
--- a/lib/kernel.nix
+++ b/nixpkgs/lib/kernel.nix
diff --git a/lib/licenses.nix b/nixpkgs/lib/licenses.nix
index c964060d2a5c..c964060d2a5c 100644
--- a/lib/licenses.nix
+++ b/nixpkgs/lib/licenses.nix
diff --git a/lib/lists.nix b/nixpkgs/lib/lists.nix
index 30d87ece6641..30d87ece6641 100644
--- a/lib/lists.nix
+++ b/nixpkgs/lib/lists.nix
diff --git a/lib/meta.nix b/nixpkgs/lib/meta.nix
index 2e83c4247ddf..2e83c4247ddf 100644
--- a/lib/meta.nix
+++ b/nixpkgs/lib/meta.nix
diff --git a/lib/minver.nix b/nixpkgs/lib/minver.nix
index fee6b65a2447..fee6b65a2447 100644
--- a/lib/minver.nix
+++ b/nixpkgs/lib/minver.nix
diff --git a/lib/modules.nix b/nixpkgs/lib/modules.nix
index 0869eae1982b..0869eae1982b 100644
--- a/lib/modules.nix
+++ b/nixpkgs/lib/modules.nix
diff --git a/lib/options.nix b/nixpkgs/lib/options.nix
index d2eae3ae3a98..d2eae3ae3a98 100644
--- a/lib/options.nix
+++ b/nixpkgs/lib/options.nix
diff --git a/lib/sources.nix b/nixpkgs/lib/sources.nix
index 0ffadea8f1bc..0ffadea8f1bc 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 e3336983428f..e3336983428f 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 ae0d74c6721d..ae0d74c6721d 100644
--- a/lib/strings.nix
+++ b/nixpkgs/lib/strings.nix
diff --git a/lib/systems/default.nix b/nixpkgs/lib/systems/default.nix
index 8aa413f53817..8aa413f53817 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 f096a0b17fc6..f096a0b17fc6 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 d17af9fcc148..d17af9fcc148 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 9a12e3c3926d..9a12e3c3926d 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 b088cd342f12..b088cd342f12 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 a2b43c970a41..a2b43c970a41 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 8bd7b605a39b..8bd7b605a39b 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 d8f412d3fc49..d8f412d3fc49 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 eadaa0521b35..eadaa0521b35 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 9a18c9d9f613..9a18c9d9f613 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 a35a06fc6974..a35a06fc6974 100644
--- a/lib/tests/modules/alias-with-priority.nix
+++ b/nixpkgs/lib/tests/modules/alias-with-priority.nix
diff --git a/lib/tests/modules/declare-coerced-value-unsound.nix b/nixpkgs/lib/tests/modules/declare-coerced-value-unsound.nix
index 7a017f24e77d..7a017f24e77d 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 76b12ad53f00..76b12ad53f00 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-enable.nix b/nixpkgs/lib/tests/modules/declare-enable.nix
index ebee243c7568..ebee243c7568 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 8b2624cc5d65..8b2624cc5d65 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 6e48c6ac8feb..6e48c6ac8feb 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 05d0eff01c94..05d0eff01c94 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-loaOfSub-any-enable.nix b/nixpkgs/lib/tests/modules/declare-loaOfSub-any-enable.nix
index 71dad1c91359..71dad1c91359 100644
--- a/lib/tests/modules/declare-loaOfSub-any-enable.nix
+++ b/nixpkgs/lib/tests/modules/declare-loaOfSub-any-enable.nix
diff --git a/lib/tests/modules/default.nix b/nixpkgs/lib/tests/modules/default.nix
index 5b0947104198..5b0947104198 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 e565fd215a57..e565fd215a57 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-enable-force.nix b/nixpkgs/lib/tests/modules/define-enable-force.nix
index f4990a328631..f4990a328631 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 7da74671d148..7da74671d148 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 7dc26010ae59..7dc26010ae59 100644
--- a/lib/tests/modules/define-enable.nix
+++ b/nixpkgs/lib/tests/modules/define-enable.nix
diff --git a/lib/tests/modules/define-force-enable.nix b/nixpkgs/lib/tests/modules/define-force-enable.nix
index 978caa2a8c07..978caa2a8c07 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-force-loaOfSub-foo-enable.nix b/nixpkgs/lib/tests/modules/define-force-loaOfSub-foo-enable.nix
index bfd8e084b590..bfd8e084b590 100644
--- a/lib/tests/modules/define-force-loaOfSub-foo-enable.nix
+++ b/nixpkgs/lib/tests/modules/define-force-loaOfSub-foo-enable.nix
diff --git a/lib/tests/modules/define-if-loaOfSub-foo-enable.nix b/nixpkgs/lib/tests/modules/define-if-loaOfSub-foo-enable.nix
index 4288d74dec00..4288d74dec00 100644
--- a/lib/tests/modules/define-if-loaOfSub-foo-enable.nix
+++ b/nixpkgs/lib/tests/modules/define-if-loaOfSub-foo-enable.nix
diff --git a/lib/tests/modules/define-loaOfSub-bar-enable.nix b/nixpkgs/lib/tests/modules/define-loaOfSub-bar-enable.nix
index 422bb0a600bf..422bb0a600bf 100644
--- a/lib/tests/modules/define-loaOfSub-bar-enable.nix
+++ b/nixpkgs/lib/tests/modules/define-loaOfSub-bar-enable.nix
diff --git a/lib/tests/modules/define-loaOfSub-bar.nix b/nixpkgs/lib/tests/modules/define-loaOfSub-bar.nix
index c24315e09b6e..c24315e09b6e 100644
--- a/lib/tests/modules/define-loaOfSub-bar.nix
+++ b/nixpkgs/lib/tests/modules/define-loaOfSub-bar.nix
diff --git a/lib/tests/modules/define-loaOfSub-foo-enable-force.nix b/nixpkgs/lib/tests/modules/define-loaOfSub-foo-enable-force.nix
index c1d7b198be54..c1d7b198be54 100644
--- a/lib/tests/modules/define-loaOfSub-foo-enable-force.nix
+++ b/nixpkgs/lib/tests/modules/define-loaOfSub-foo-enable-force.nix
diff --git a/lib/tests/modules/define-loaOfSub-foo-enable-if.nix b/nixpkgs/lib/tests/modules/define-loaOfSub-foo-enable-if.nix
index 44b2c96cd021..44b2c96cd021 100644
--- a/lib/tests/modules/define-loaOfSub-foo-enable-if.nix
+++ b/nixpkgs/lib/tests/modules/define-loaOfSub-foo-enable-if.nix
diff --git a/lib/tests/modules/define-loaOfSub-foo-enable.nix b/nixpkgs/lib/tests/modules/define-loaOfSub-foo-enable.nix
index 822425c71bb9..822425c71bb9 100644
--- a/lib/tests/modules/define-loaOfSub-foo-enable.nix
+++ b/nixpkgs/lib/tests/modules/define-loaOfSub-foo-enable.nix
diff --git a/lib/tests/modules/define-loaOfSub-foo-force-enable.nix b/nixpkgs/lib/tests/modules/define-loaOfSub-foo-force-enable.nix
index dce0ef547b31..dce0ef547b31 100644
--- a/lib/tests/modules/define-loaOfSub-foo-force-enable.nix
+++ b/nixpkgs/lib/tests/modules/define-loaOfSub-foo-force-enable.nix
diff --git a/lib/tests/modules/define-loaOfSub-foo-if-enable.nix b/nixpkgs/lib/tests/modules/define-loaOfSub-foo-if-enable.nix
index 236b2840ee51..236b2840ee51 100644
--- a/lib/tests/modules/define-loaOfSub-foo-if-enable.nix
+++ b/nixpkgs/lib/tests/modules/define-loaOfSub-foo-if-enable.nix
diff --git a/lib/tests/modules/define-loaOfSub-foo.nix b/nixpkgs/lib/tests/modules/define-loaOfSub-foo.nix
index e9b2e631f2ec..e9b2e631f2ec 100644
--- a/lib/tests/modules/define-loaOfSub-foo.nix
+++ b/nixpkgs/lib/tests/modules/define-loaOfSub-foo.nix
diff --git a/lib/tests/modules/define-loaOfSub-force-foo-enable.nix b/nixpkgs/lib/tests/modules/define-loaOfSub-force-foo-enable.nix
index df5722274ee5..df5722274ee5 100644
--- a/lib/tests/modules/define-loaOfSub-force-foo-enable.nix
+++ b/nixpkgs/lib/tests/modules/define-loaOfSub-force-foo-enable.nix
diff --git a/lib/tests/modules/define-loaOfSub-if-foo-enable.nix b/nixpkgs/lib/tests/modules/define-loaOfSub-if-foo-enable.nix
index bd2d068d31a2..bd2d068d31a2 100644
--- a/lib/tests/modules/define-loaOfSub-if-foo-enable.nix
+++ b/nixpkgs/lib/tests/modules/define-loaOfSub-if-foo-enable.nix
diff --git a/lib/tests/modules/define-module-check.nix b/nixpkgs/lib/tests/modules/define-module-check.nix
index 5a0707c975fa..5a0707c975fa 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-value-int-negative.nix b/nixpkgs/lib/tests/modules/define-value-int-negative.nix
index a041222987ad..a041222987ad 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 5803de172636..5803de172636 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 68bb9f415c3c..68bb9f415c3c 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 4831c1cc09ba..4831c1cc09ba 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 8e3abaf536a0..8e3abaf536a0 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 f27e31985c92..f27e31985c92 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 e7a166965a7a..e7a166965a7a 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 a373ee7e550e..a373ee7e550e 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 0d84a7c3cb6c..0d84a7c3cb6c 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 c325f4e07431..c325f4e07431 100644
--- a/lib/tests/modules/disable-enable-modules.nix
+++ b/nixpkgs/lib/tests/modules/disable-enable-modules.nix
diff --git a/lib/tests/modules/import-custom-arg.nix b/nixpkgs/lib/tests/modules/import-custom-arg.nix
index 3e687b661c16..3e687b661c16 100644
--- a/lib/tests/modules/import-custom-arg.nix
+++ b/nixpkgs/lib/tests/modules/import-custom-arg.nix
diff --git a/lib/tests/modules/loaOf-with-long-list.nix b/nixpkgs/lib/tests/modules/loaOf-with-long-list.nix
index f30903c47e50..f30903c47e50 100644
--- a/lib/tests/modules/loaOf-with-long-list.nix
+++ b/nixpkgs/lib/tests/modules/loaOf-with-long-list.nix
diff --git a/lib/tests/modules/loaOf-with-many-list-merges.nix b/nixpkgs/lib/tests/modules/loaOf-with-many-list-merges.nix
index f8f8a8da82bc..f8f8a8da82bc 100644
--- a/lib/tests/modules/loaOf-with-many-list-merges.nix
+++ b/nixpkgs/lib/tests/modules/loaOf-with-many-list-merges.nix
diff --git a/lib/tests/release.nix b/nixpkgs/lib/tests/release.nix
index 737d142d2532..737d142d2532 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 5748c09b564d..5748c09b564d 100644
--- a/lib/tests/systems.nix
+++ b/nixpkgs/lib/tests/systems.nix
diff --git a/lib/trivial.nix b/nixpkgs/lib/trivial.nix
index f2710a6f0338..f2710a6f0338 100644
--- a/lib/trivial.nix
+++ b/nixpkgs/lib/trivial.nix
diff --git a/lib/types.nix b/nixpkgs/lib/types.nix
index b225119299da..b225119299da 100644
--- a/lib/types.nix
+++ b/nixpkgs/lib/types.nix
diff --git a/lib/versions.nix b/nixpkgs/lib/versions.nix
index 8f7f98ff5e1e..8f7f98ff5e1e 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 edbcdfe1e682..edbcdfe1e682 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 ef2ab823acc7..ef2ab823acc7 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 6a4de8a4b951..6a4de8a4b951 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 879a2e452cb3..879a2e452cb3 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 59696a4432d8..59696a4432d8 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 b4923fb537e9..b4923fb537e9 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 28ad22c334fc..28ad22c334fc 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 bb9572cbc795..bb9572cbc795 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 e0dfaf1de74c..e0dfaf1de74c 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 a267a5fa8715..a267a5fa8715 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 52cce9099183..52cce9099183 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 23669502e46d..23669502e46d 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 c8e03424f320..c8e03424f320 100755
--- a/maintainers/scripts/hydra_eval_check
+++ b/nixpkgs/maintainers/scripts/hydra_eval_check
diff --git a/maintainers/scripts/luarocks-packages.csv b/nixpkgs/maintainers/scripts/luarocks-packages.csv
index 2039af5165a0..2039af5165a0 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 be478fca2b75..be478fca2b75 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 0c65e29cf435..0c65e29cf435 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 5c4cf0f6c558..5c4cf0f6c558 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 2dda39fd12e1..2dda39fd12e1 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 6d99c94bf33e..6d99c94bf33e 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 638d1b2aaa16..638d1b2aaa16 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 5fdfc15dc232..5fdfc15dc232 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 1a54cada8af6..1a54cada8af6 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 d65cf3ec5f63..d65cf3ec5f63 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 23ec6e401be4..23ec6e401be4 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 a8d67d208e38..a8d67d208e38 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 23a940b3691b..23a940b3691b 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 4a6024c40380..4a6024c40380 100755
--- a/maintainers/scripts/update-python-libraries
+++ b/nixpkgs/maintainers/scripts/update-python-libraries
diff --git a/maintainers/scripts/update.nix b/nixpkgs/maintainers/scripts/update.nix
index 04723cb8a366..04723cb8a366 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 eb7d0ef2647b..eb7d0ef2647b 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 4a7bc3aea44e..4a7bc3aea44e 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 aa7d4ec967da..aa7d4ec967da 100755
--- a/maintainers/scripts/vanity.sh
+++ b/nixpkgs/maintainers/scripts/vanity.sh
diff --git a/nixos/COPYING b/nixpkgs/nixos/COPYING
index c9b44cb8aaeb..c9b44cb8aaeb 100644
--- a/nixos/COPYING
+++ b/nixpkgs/nixos/COPYING
diff --git a/nixos/README b/nixpkgs/nixos/README
index 4ecf648a9302..4ecf648a9302 100644
--- a/nixos/README
+++ b/nixpkgs/nixos/README
diff --git a/nixos/default.nix b/nixpkgs/nixos/default.nix
index 45da78e9261c..45da78e9261c 100644
--- a/nixos/default.nix
+++ b/nixpkgs/nixos/default.nix
diff --git a/nixos/doc/manual/.gitignore b/nixpkgs/nixos/doc/manual/.gitignore
index 879282624217..879282624217 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 9ff599a0090f..9ff599a0090f 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 587f6275197a..587f6275197a 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 de3d8ac21aeb..de3d8ac21aeb 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 526803e429ba..526803e429ba 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 42486f01fe8c..42486f01fe8c 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 0d3355e56a58..0d3355e56a58 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 16d03cc0d1ab..16d03cc0d1ab 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 d03dbc4d7055..d03dbc4d7055 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 7ded0c11786e..7ded0c11786e 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 da4877fcdf08..da4877fcdf08 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 71e3f9ea665d..71e3f9ea665d 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 570f58358845..570f58358845 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 a5abd6f02588..a5abd6f02588 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 fb87810ba461..fb87810ba461 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 19bec1f7794d..19bec1f7794d 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 1b9c745eb59f..1b9c745eb59f 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 b9d11152d5e1..b9d11152d5e1 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 6496e7bde387..6496e7bde387 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 80daf6bdbff0..80daf6bdbff0 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 5bf0635cc1aa..5bf0635cc1aa 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 00e595c7cb7f..00e595c7cb7f 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 c7e882d846fa..c7e882d846fa 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 182641055e4d..182641055e4d 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 eadafb94b8f6..eadafb94b8f6 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 5ef498cf9ae3..5ef498cf9ae3 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 5961209bc13a..5961209bc13a 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 03b5bb53197b..03b5bb53197b 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 5fb3bcb9f8f5..5fb3bcb9f8f5 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 e4c03de71b72..e4c03de71b72 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 47a19ac82c0f..47a19ac82c0f 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 71ddf41491ba..71ddf41491ba 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 675a5d9a260d..675a5d9a260d 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 54a100e44795..54a100e44795 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 644d3a33ffd2..644d3a33ffd2 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 8a2b107e0ee8..8a2b107e0ee8 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 4c559a71e813..4c559a71e813 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 7ad0ae80a48a..7ad0ae80a48a 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 d103ee249783..d103ee249783 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 02cf811e0bd3..02cf811e0bd3 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 e8ac5d0681a9..e8ac5d0681a9 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 9d08f7f7bed2..9d08f7f7bed2 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 2936f71069d5..2936f71069d5 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 b75f6ba25b4f..b75f6ba25b4f 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 234835845e2d..234835845e2d 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 395a5ec357c9..395a5ec357c9 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 efa7b8f24c43..efa7b8f24c43 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 73e3abc59d0c..73e3abc59d0c 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 dc83fc837e2a..dc83fc837e2a 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 1b64497ebf7f..1b64497ebf7f 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 3dcdf403d89d..3dcdf403d89d 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 179f2d0be64b..179f2d0be64b 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 5d055c45d2d8..5d055c45d2d8 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 a4af1b96583d..a4af1b96583d 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 ea980254a8fc..ea980254a8fc 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 4b1710f3a2b1..4b1710f3a2b1 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 9c0e3a8d7aa4..9c0e3a8d7aa4 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 798d1fbdfd85..798d1fbdfd85 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 6ac99c6b2bee..6ac99c6b2bee 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 7fc0ad702f84..7fc0ad702f84 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 32f90cf2e7c4..32f90cf2e7c4 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 56a596baed00..56a596baed00 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 88369fb891b3..88369fb891b3 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 43f511b3e96b..43f511b3e96b 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 1c6a5671eda8..1c6a5671eda8 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 3d019a4987e1..3d019a4987e1 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 2695082e3867..2695082e3867 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 eee81bf64263..eee81bf64263 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 50a705d0cb8e..50a705d0cb8e 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 069cc36573d8..069cc36573d8 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 f45fecd16c35..f45fecd16c35 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 7b103c36d907..7b103c36d907 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 e390d62fde2f..e390d62fde2f 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 13ae1ed93699..13ae1ed93699 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 3c30c782746d..3c30c782746d 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 902f995fbc1b..902f995fbc1b 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 2183937ad0da..2183937ad0da 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 bbf793bb0be9..bbf793bb0be9 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 6be2d0a4d231..6be2d0a4d231 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 b77d71389a9d..b77d71389a9d 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 2901f462dee0..2901f462dee0 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 8f9baff44b51..8f9baff44b51 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 8ed45899fd7f..8ed45899fd7f 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 94199e5e028d..94199e5e028d 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 83598635acca..83598635acca 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 5c86eacfbf45..5c86eacfbf45 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 742376378dea..742376378dea 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 56af5c0e25a0..56af5c0e25a0 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 35b4d266e12e..35b4d266e12e 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 9f30b7925101..9f30b7925101 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 7d6e04e0dd90..7d6e04e0dd90 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 42edaa1ae5b6..42edaa1ae5b6 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 61531a8f01ca..61531a8f01ca 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 4fb94ee7494c..4fb94ee7494c 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 3e316e10d4eb..3e316e10d4eb 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 9cec83f1e28b..9cec83f1e28b 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 931c4a5ad029..931c4a5ad029 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 0390dda6468f..0390dda6468f 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 12f52e1997c8..12f52e1997c8 100644
--- a/nixos/doc/manual/manual.xml
+++ b/nixpkgs/nixos/doc/manual/manual.xml
diff --git a/nixos/doc/manual/options-to-docbook.xsl b/nixpkgs/nixos/doc/manual/options-to-docbook.xsl
index 72ac89d4ff62..72ac89d4ff62 100644
--- a/nixos/doc/manual/options-to-docbook.xsl
+++ b/nixpkgs/nixos/doc/manual/options-to-docbook.xsl
diff --git a/nixos/doc/manual/postprocess-option-descriptions.xsl b/nixpkgs/nixos/doc/manual/postprocess-option-descriptions.xsl
index 1201c7612c2e..1201c7612c2e 100644
--- a/nixos/doc/manual/postprocess-option-descriptions.xsl
+++ b/nixpkgs/nixos/doc/manual/postprocess-option-descriptions.xsl
diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixpkgs/nixos/doc/manual/release-notes/release-notes.xml
index 02b591477214..02b591477214 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 248bab70c36b..248bab70c36b 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 8d8cea4303a3..8d8cea4303a3 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 139f61c2a550..139f61c2a550 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 5c4d99701785..5c4d99701785 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 9b512c4b1e58..9b512c4b1e58 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 4a2343edc970..4a2343edc970 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 86f4a1ccfb78..86f4a1ccfb78 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 795c51d2923d..795c51d2923d 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 c14679eea071..c14679eea071 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 3f10b26223dd..3f10b26223dd 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 8ff1681d3b4a..8ff1681d3b4a 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 53f5b8bb7321..53f5b8bb7321 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/shell.nix b/nixpkgs/nixos/doc/manual/shell.nix
index cc3609d750e0..cc3609d750e0 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 6c7cc1e6439b..6c7cc1e6439b 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 4a565c8465bc..4a565c8465bc 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 6c92aa1ffa2f..6c92aa1ffa2f 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 77490ca3762a..77490ca3762a 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 6bd71e40e9a1..6bd71e40e9a1 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 9b920b989fcf..9b920b989fcf 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 5e86ea479d51..5e86ea479d51 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 932adcd97967..932adcd97967 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 8cd19b6e1874..8cd19b6e1874 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 b7b1ab52a637..b7b1ab52a637 100644
--- a/nixos/lib/make-iso9660-image.sh
+++ b/nixpkgs/nixos/lib/make-iso9660-image.sh
diff --git a/nixos/lib/make-squashfs.nix b/nixpkgs/nixos/lib/make-squashfs.nix
index ee76c9c5bf24..ee76c9c5bf24 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 dee91a6ce3f4..dee91a6ce3f4 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 1a0017a1799a..1a0017a1799a 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 779f0377a512..779f0377a512 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 080310ea34e0..080310ea34e0 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 006da889671e..006da889671e 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 0485412b4c8e..0485412b4c8e 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 a54d8504a867..a54d8504a867 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 a3354fb0e1eb..a3354fb0e1eb 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/treebits.js b/nixpkgs/nixos/lib/test-driver/treebits.js
index 9754093dfd07..9754093dfd07 100644
--- a/nixos/lib/test-driver/treebits.js
+++ b/nixpkgs/nixos/lib/test-driver/treebits.js
diff --git a/nixos/lib/testing.nix b/nixpkgs/nixos/lib/testing.nix
index 767068771036..767068771036 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 e65107a3c2fb..e65107a3c2fb 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 e272f66a5765..e272f66a5765 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 b68e55a40b90..b68e55a40b90 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 a67a0ab960e5..a67a0ab960e5 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 2b22cb536619..2b22cb536619 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 2ea35d1d4c33..2ea35d1d4c33 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 37b46db059c0..37b46db059c0 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 88d95e675447..88d95e675447 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 790cc6cbc531..790cc6cbc531 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 48748a59d298..48748a59d298 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 4c464f43f61d..4c464f43f61d 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 483ac9c3cd76..483ac9c3cd76 100644
--- a/nixos/modules/config/appstream.nix
+++ b/nixpkgs/nixos/modules/config/appstream.nix
diff --git a/nixos/modules/config/debug-info.nix b/nixpkgs/nixos/modules/config/debug-info.nix
index 2942ae5905d1..2942ae5905d1 100644
--- a/nixos/modules/config/debug-info.nix
+++ b/nixpkgs/nixos/modules/config/debug-info.nix
diff --git a/nixos/modules/config/fonts/corefonts.nix b/nixpkgs/nixos/modules/config/fonts/corefonts.nix
index b9f69879a103..b9f69879a103 100644
--- a/nixos/modules/config/fonts/corefonts.nix
+++ b/nixpkgs/nixos/modules/config/fonts/corefonts.nix
diff --git a/nixos/modules/config/fonts/fontconfig-penultimate.nix b/nixpkgs/nixos/modules/config/fonts/fontconfig-penultimate.nix
index 04fa8b9559a9..04fa8b9559a9 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-ultimate.nix b/nixpkgs/nixos/modules/config/fonts/fontconfig-ultimate.nix
index 45328f3eaf13..45328f3eaf13 100644
--- a/nixos/modules/config/fonts/fontconfig-ultimate.nix
+++ b/nixpkgs/nixos/modules/config/fonts/fontconfig-ultimate.nix
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixpkgs/nixos/modules/config/fonts/fontconfig.nix
index 724158f73821..724158f73821 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 cc70fbf8744d..cc70fbf8744d 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 0dd01df9da74..0dd01df9da74 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 1c62a525de94..1c62a525de94 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 93d130970190..93d130970190 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 9c5d993b9c59..9c5d993b9c59 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 dc7305b1ba24..dc7305b1ba24 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 a1d9ebcec66b..a1d9ebcec66b 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 87021a27d34f..87021a27d34f 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 e008497a2a6e..e008497a2a6e 100644
--- a/nixos/modules/config/ldap.nix
+++ b/nixpkgs/nixos/modules/config/ldap.nix
diff --git a/nixos/modules/config/malloc.nix b/nixpkgs/nixos/modules/config/malloc.nix
index 65130454735c..65130454735c 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 eab4e73e19a1..eab4e73e19a1 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 aad02a9ca4e3..aad02a9ca4e3 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 13277fe56e42..13277fe56e42 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 0277f1ad11e9..0277f1ad11e9 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 5c3e39302583..5c3e39302583 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixpkgs/nixos/modules/config/pulseaudio.nix
diff --git a/nixos/modules/config/shells-environment.nix b/nixpkgs/nixos/modules/config/shells-environment.nix
index 6379b52870ea..6379b52870ea 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 fed3fa3bc7c8..fed3fa3bc7c8 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 0c6a7e2431aa..0c6a7e2431aa 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 6011e354ece4..6011e354ece4 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 fae2fc740082..fae2fc740082 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 4fd6ba5ea605..4fd6ba5ea605 100644
--- a/nixos/modules/config/terminfo.nix
+++ b/nixpkgs/nixos/modules/config/terminfo.nix
diff --git a/nixos/modules/config/timezone.nix b/nixpkgs/nixos/modules/config/timezone.nix
index b15948f6e2e5..b15948f6e2e5 100644
--- a/nixos/modules/config/timezone.nix
+++ b/nixpkgs/nixos/modules/config/timezone.nix
diff --git a/nixos/modules/config/unix-odbc-drivers.nix b/nixpkgs/nixos/modules/config/unix-odbc-drivers.nix
index 8dd811727389..8dd811727389 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 ef5e6346f02e..c1d6a079dee1 100644
--- a/nixos/modules/config/update-users-groups.pl
+++ b/nixpkgs/nixos/modules/config/update-users-groups.pl
@@ -1,4 +1,5 @@
 use strict;
+use File::Basename;
 use File::Path qw(make_path);
 use File::Slurp;
 use JSON;
@@ -213,7 +214,8 @@ foreach my $u (@{$spec->{users}}) {
 
     # Create a home directory.
     if ($u->{createHome}) {
-        make_path($u->{home}, { mode => 0700 }) if ! -e $u->{home};
+        make_path(dirname($u->{home}), { mode => 0755 });
+        mkdir $u->{home}, 0700 if ! -e $u->{home};
         chown $u->{uid}, $u->{gid}, $u->{home};
     }
 
diff --git a/nixos/modules/config/users-groups.nix b/nixpkgs/nixos/modules/config/users-groups.nix
index c3f228c9bcc4..c3f228c9bcc4 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixpkgs/nixos/modules/config/users-groups.nix
diff --git a/nixos/modules/config/vpnc.nix b/nixpkgs/nixos/modules/config/vpnc.nix
index 356e007c0a3e..356e007c0a3e 100644
--- a/nixos/modules/config/vpnc.nix
+++ b/nixpkgs/nixos/modules/config/vpnc.nix
diff --git a/nixos/modules/config/xdg/autostart.nix b/nixpkgs/nixos/modules/config/xdg/autostart.nix
index 0ee94fed818b..0ee94fed818b 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 8268a3771a0e..8268a3771a0e 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 c172692df5d7..c172692df5d7 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 a5374c2b468d..a5374c2b468d 100644
--- a/nixos/modules/config/xdg/mime.nix
+++ b/nixpkgs/nixos/modules/config/xdg/mime.nix
diff --git a/nixos/modules/config/xdg/sounds.nix b/nixpkgs/nixos/modules/config/xdg/sounds.nix
index 148240d631cf..148240d631cf 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 5d411c73a560..5d411c73a560 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 34e8a2220965..34e8a2220965 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 534fcc34276b..534fcc34276b 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 925443477143..925443477143 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 341e4b791c23..341e4b791c23 100644
--- a/nixos/modules/hardware/brightnessctl.nix
+++ b/nixpkgs/nixos/modules/hardware/brightnessctl.nix
diff --git a/nixos/modules/hardware/ckb-next.nix b/nixpkgs/nixos/modules/hardware/ckb-next.nix
index 20b2756d8b26..20b2756d8b26 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 621c7066bfe1..621c7066bfe1 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 acce565fd808..acce565fd808 100644
--- a/nixos/modules/hardware/cpu/intel-microcode.nix
+++ b/nixpkgs/nixos/modules/hardware/cpu/intel-microcode.nix
diff --git a/nixos/modules/hardware/digitalbitbox.nix b/nixpkgs/nixos/modules/hardware/digitalbitbox.nix
index 0888cfbef2a8..0888cfbef2a8 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 99d46c25236e..99d46c25236e 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 41abe74315a0..41abe74315a0 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 d6f43bdddcc8..d6f43bdddcc8 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 13ad238870c2..13ad238870c2 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 e63f2d04d1a6..e63f2d04d1a6 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 c92b7a0509d0..c92b7a0509d0 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 17b973474c93..17b973474c93 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 b00286464f34..b00286464f34 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 5f13088c3735..5f13088c3735 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 5dd7f30ed82b..5dd7f30ed82b 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 60fc95a75828..60fc95a75828 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 b6820fe01911..b6820fe01911 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 6583530e5684..6583530e5684 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 2defab51bc3a..2defab51bc3a 100644
--- a/nixos/modules/hardware/opengl.nix
+++ b/nixpkgs/nixos/modules/hardware/opengl.nix
diff --git a/nixos/modules/hardware/pcmcia.nix b/nixpkgs/nixos/modules/hardware/pcmcia.nix
index d7d002ae6c8a..d7d002ae6c8a 100644
--- a/nixos/modules/hardware/pcmcia.nix
+++ b/nixpkgs/nixos/modules/hardware/pcmcia.nix
diff --git a/nixos/modules/hardware/raid/hpsa.nix b/nixpkgs/nixos/modules/hardware/raid/hpsa.nix
index 3a65cb800a98..3a65cb800a98 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 a8bc18800021..a8bc18800021 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 378aeffe71b5..378aeffe71b5 100644
--- a/nixos/modules/hardware/steam-hardware.nix
+++ b/nixpkgs/nixos/modules/hardware/steam-hardware.nix
diff --git a/nixos/modules/hardware/usb-wwan.nix b/nixpkgs/nixos/modules/hardware/usb-wwan.nix
index 2d20421586a7..2d20421586a7 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 ab9e0c92020e..ab9e0c92020e 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 42fc8fa362de..42fc8fa362de 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 6102919f0155..6102919f0155 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 2278c7b40611..2278c7b40611 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 61bab533edaf..61bab533edaf 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 669ac849cbad..669ac849cbad 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 a5740929a310..a5740929a310 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 c92b7a0509d0..c92b7a0509d0 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 7e3e94fdf2bd..7e3e94fdf2bd 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 a808429c9996..a808429c9996 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 d311f600c319..d311f600c319 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 9548a249efa0..9548a249efa0 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 117482fb0d57..117482fb0d57 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 440f13b41522..440f13b41522 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 f8e021f551e8..f8e021f551e8 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 87620ae4e7b2..87620ae4e7b2 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 7ad68bf851fe..7ad68bf851fe 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 ab5e7c0645f3..ab5e7c0645f3 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 24070a786945..24070a786945 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 f65239a5bc0a..f65239a5bc0a 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 0b813bbf37b4..0b813bbf37b4 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-kde-new-kernel.nix b/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix
index 3336d512cfd8..3336d512cfd8 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix
+++ b/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix b/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
index 1c3c9cb30b41..1c3c9cb30b41 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
+++ b/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.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 3911a2b01b1e..3911a2b01b1e 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 bcdbffdc20b7..bcdbffdc20b7 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 d5c92cfc1d9e..d5c92cfc1d9e 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 2882fbcc7305..2882fbcc7305 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 a9241870fa71..a9241870fa71 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 dab092415316..dab092415316 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 8c9090471dcd..8c9090471dcd 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.nix b/nixpkgs/nixos/modules/installer/cd-dvd/sd-image.nix
index 0c407b199367..0c407b199367 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 6d4ba96dba0c..6d4ba96dba0c 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 84252f292c54..84252f292c54 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 5da5df81ede1..5da5df81ede1 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 90a5128c02a5..90a5128c02a5 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 b84096861f56..b84096861f56 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 7e66a49c7391..7e66a49c7391 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 1563501a7e01..1563501a7e01 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 cdfba5ab9e31..cdfba5ab9e31 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 5c5fba56f517..5c5fba56f517 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 baa068c08dbf..baa068c08dbf 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 b8972cd57d22..b8972cd57d22 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 b9ab2053c41f..b9ab2053c41f 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 c1028a0ad7e9..c1028a0ad7e9 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 25106733087e..25106733087e 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 518dbbbf21e3..518dbbbf21e3 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 c09def1fceae..c09def1fceae 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 8685cb345e1e..8685cb345e1e 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.sh b/nixpkgs/nixos/modules/installer/tools/nixos-option.sh
index 4560e9c7403a..4560e9c7403a 100644
--- a/nixos/modules/installer/tools/nixos-option.sh
+++ b/nixpkgs/nixos/modules/installer/tools/nixos-option.sh
diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixpkgs/nixos/modules/installer/tools/nixos-rebuild.sh
index 6a08c9b4c6c6..6a08c9b4c6c6 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 190c49a33ec6..190c49a33ec6 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 59eb4a63af40..59eb4a63af40 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 af3e1aecca71..af3e1aecca71 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 550b3ac97f6a..550b3ac97f6a 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 6e0b49fa9af0..6e0b49fa9af0 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 deecb005270f..deecb005270f 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 8716e3d9fef2..8716e3d9fef2 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 14ba5a573b18..08f7b827948d 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixpkgs/nixos/modules/misc/ids.nix
@@ -3,7 +3,7 @@
 
 # IMPORTANT!
 # We only add static uids and gids for services where it is not feasible
-# to change uids/gids on service start, in example a service with a lot of
+# to change uids/gids on service start, for example a service with a lot of
 # files. Please also check if the service is applicable for systemd's
 # DynamicUser option and does not need a uid/gid allocation at all.
 # Systemd can also change ownership of service directories using the
diff --git a/nixos/modules/misc/label.nix b/nixpkgs/nixos/modules/misc/label.nix
index 02b91555b3c2..02b91555b3c2 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 121f396701ea..121f396701ea 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 449149e4bb65..449149e4bb65 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 be3f4cbbcfe4..be3f4cbbcfe4 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 20c143286afa..20c143286afa 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 e0c192246c0c..e0c192246c0c 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 4e99631fdd85..4e99631fdd85 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 3ae60cb79160..3ae60cb79160 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixpkgs/nixos/modules/misc/version.nix
diff --git a/nixos/modules/module-list.nix b/nixpkgs/nixos/modules/module-list.nix
index 1d1995eda25a..1c4cf4da4097 100644
--- a/nixos/modules/module-list.nix
+++ b/nixpkgs/nixos/modules/module-list.nix
@@ -313,6 +313,7 @@
   ./services/hardware/bluetooth.nix
   ./services/hardware/bolt.nix
   ./services/hardware/brltty.nix
+  ./services/hardware/evscript.nix
   ./services/hardware/freefall.nix
   ./services/hardware/fwupd.nix
   ./services/hardware/illum.nix
diff --git a/nixos/modules/profiles/all-hardware.nix b/nixpkgs/nixos/modules/profiles/all-hardware.nix
index 19f821ae17f3..19f821ae17f3 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 2a2fe119d30c..2a2fe119d30c 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 3f669ba7d2e1..3f669ba7d2e1 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 18f190071bad..18f190071bad 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 5d6b11498b52..5d6b11498b52 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 649f5564ac61..649f5564ac61 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 97279a78a57b..97279a78a57b 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 46a9b6a7d8d5..46a9b6a7d8d5 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 580ea4a58e5b..580ea4a58e5b 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 f044e6f39ea5..f044e6f39ea5 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 315d04093b13..315d04093b13 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 250d8c252a3b..250d8c252a3b 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 4651cdb76e0b..4651cdb76e0b 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 3a8feec4bb45..3a8feec4bb45 100644
--- a/nixos/modules/programs/autojump.nix
+++ b/nixpkgs/nixos/modules/programs/autojump.nix
diff --git a/nixos/modules/programs/bash/bash.nix b/nixpkgs/nixos/modules/programs/bash/bash.nix
index a7e57b8608d7..a7e57b8608d7 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 f339eb649ed8..f339eb649ed8 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 d76249bb5cab..d76249bb5cab 100644
--- a/nixos/modules/programs/bcc.nix
+++ b/nixpkgs/nixos/modules/programs/bcc.nix
diff --git a/nixos/modules/programs/blcr.nix b/nixpkgs/nixos/modules/programs/blcr.nix
index 804e1d01f12b..804e1d01f12b 100644
--- a/nixos/modules/programs/blcr.nix
+++ b/nixpkgs/nixos/modules/programs/blcr.nix
diff --git a/nixos/modules/programs/browserpass.nix b/nixpkgs/nixos/modules/programs/browserpass.nix
index e1456d3c1848..e1456d3c1848 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 55d474e5c9db..55d474e5c9db 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 874774c72b47..874774c72b47 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 6a0185d362c5..6a0185d362c5 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 41c49db8c71c..41c49db8c71c 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 9980a7daf525..9980a7daf525 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 656c255fcb18..656c255fcb18 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 ab7aa204653c..ab7aa204653c 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 48cf5c88a9fc..48cf5c88a9fc 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 b7bfb8504b6f..b7bfb8504b6f 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 2fe0a14412c5..2fe0a14412c5 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 c63201628dbd..c63201628dbd 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 e48a4f318370..e48a4f318370 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 3c6d356ef998..3c6d356ef998 100644
--- a/nixos/modules/programs/environment.nix
+++ b/nixpkgs/nixos/modules/programs/environment.nix
diff --git a/nixos/modules/programs/firejail.nix b/nixpkgs/nixos/modules/programs/firejail.nix
index 46ee4bc0f7a0..46ee4bc0f7a0 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 87f6816e4ac0..87f6816e4ac0 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 a8c797d185a6..a8c797d185a6 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 e0860a242b74..e0860a242b74 100644
--- a/nixos/modules/programs/freetds.nix
+++ b/nixpkgs/nixos/modules/programs/freetds.nix
diff --git a/nixos/modules/programs/gnupg.nix b/nixpkgs/nixos/modules/programs/gnupg.nix
index 9618d61a1f5b..9618d61a1f5b 100644
--- a/nixos/modules/programs/gnupg.nix
+++ b/nixpkgs/nixos/modules/programs/gnupg.nix
diff --git a/nixos/modules/programs/gphoto2.nix b/nixpkgs/nixos/modules/programs/gphoto2.nix
index 93923ff3133c..93923ff3133c 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 a98a9a8187d4..a98a9a8187d4 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 5512dbc62f72..5512dbc62f72 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 d31698c3b392..d31698c3b392 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 58e45872fac8..58e45872fac8 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 9fdf99e9c694..9fdf99e9c694 100644
--- a/nixos/modules/programs/less.nix
+++ b/nixpkgs/nixos/modules/programs/less.nix
diff --git a/nixos/modules/programs/light.nix b/nixpkgs/nixos/modules/programs/light.nix
index 9f2a03e7e763..9f2a03e7e763 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 ecc924325e6b..ecc924325e6b 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 359fe23e0ecd..359fe23e0ecd 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 1fdec4c04f68..1fdec4c04f68 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 6a4d46338e19..6a4d46338e19 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 e42219e9638c..e42219e9638c 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 5fdd4fa841a1..5fdd4fa841a1 100644
--- a/nixos/modules/programs/npm.nix
+++ b/nixpkgs/nixos/modules/programs/npm.nix
diff --git a/nixos/modules/programs/nylas-mail.nix b/nixpkgs/nixos/modules/programs/nylas-mail.nix
index 08a6cd0a6049..08a6cd0a6049 100644
--- a/nixos/modules/programs/nylas-mail.nix
+++ b/nixpkgs/nixos/modules/programs/nylas-mail.nix
diff --git a/nixos/modules/programs/oblogout.nix b/nixpkgs/nixos/modules/programs/oblogout.nix
index 720c29b1eaee..720c29b1eaee 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 065e72d6c374..065e72d6c374 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 902cd89e0c49..902cd89e0c49 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 aeb7fc508495..aeb7fc508495 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 c1daaa58f16f..c1daaa58f16f 100644
--- a/nixos/modules/programs/screen.nix
+++ b/nixpkgs/nixos/modules/programs/screen.nix
diff --git a/nixos/modules/programs/sedutil.nix b/nixpkgs/nixos/modules/programs/sedutil.nix
index 7efc80f4abba..7efc80f4abba 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 8ec4169207db..8ec4169207db 100644
--- a/nixos/modules/programs/shadow.nix
+++ b/nixpkgs/nixos/modules/programs/shadow.nix
diff --git a/nixos/modules/programs/shell.nix b/nixpkgs/nixos/modules/programs/shell.nix
index 9842e2bef643..9842e2bef643 100644
--- a/nixos/modules/programs/shell.nix
+++ b/nixpkgs/nixos/modules/programs/shell.nix
diff --git a/nixos/modules/programs/singularity.nix b/nixpkgs/nixos/modules/programs/singularity.nix
index b27e122bd1d9..b27e122bd1d9 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 0e1281e62cd7..0e1281e62cd7 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 6d03608402fc..6d03608402fc 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 46965dd35b71..46965dd35b71 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 0e060e3f5226..0e060e3f5226 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 b4f03151cdc1..b4f03151cdc1 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 fbbf29065564..fbbf29065564 100644
--- a/nixos/modules/programs/sysdig.nix
+++ b/nixpkgs/nixos/modules/programs/sysdig.nix
diff --git a/nixos/modules/programs/systemtap.nix b/nixpkgs/nixos/modules/programs/systemtap.nix
index ca81e018c9dc..ca81e018c9dc 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 21ed6603c1bd..21ed6603c1bd 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 ed077e3daa76..ed077e3daa76 100644
--- a/nixos/modules/programs/tmux.nix
+++ b/nixpkgs/nixos/modules/programs/tmux.nix
diff --git a/nixos/modules/programs/udevil.nix b/nixpkgs/nixos/modules/programs/udevil.nix
index ba5670f9dfe9..ba5670f9dfe9 100644
--- a/nixos/modules/programs/udevil.nix
+++ b/nixpkgs/nixos/modules/programs/udevil.nix
diff --git a/nixos/modules/programs/venus.nix b/nixpkgs/nixos/modules/programs/venus.nix
index 110570ac3f06..110570ac3f06 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 fe0e7f2c6d6b..fe0e7f2c6d6b 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 be96cf23b396..be96cf23b396 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 ac665fe4a023..ac665fe4a023 100644
--- a/nixos/modules/programs/wavemon.nix
+++ b/nixpkgs/nixos/modules/programs/wavemon.nix
diff --git a/nixos/modules/programs/way-cooler.nix b/nixpkgs/nixos/modules/programs/way-cooler.nix
index f27bd42bd764..f27bd42bd764 100644
--- a/nixos/modules/programs/way-cooler.nix
+++ b/nixpkgs/nixos/modules/programs/way-cooler.nix
diff --git a/nixos/modules/programs/waybar.nix b/nixpkgs/nixos/modules/programs/waybar.nix
index 22530e6c7d4d..22530e6c7d4d 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 819f15b98a05..819f15b98a05 100644
--- a/nixos/modules/programs/wireshark.nix
+++ b/nixpkgs/nixos/modules/programs/wireshark.nix
diff --git a/nixos/modules/programs/xfs_quota.nix b/nixpkgs/nixos/modules/programs/xfs_quota.nix
index 648fd9a8a94f..648fd9a8a94f 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 ceab9b5db931..ceab9b5db931 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 070463311db5..070463311db5 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 db085211366e..db085211366e 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 2e27fce4d7c6..2e27fce4d7c6 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 f4df4e983e42..f4df4e983e42 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 568c2de65576..568c2de65576 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 6121f3e21f16..6121f3e21f16 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 630114bcda9f..630114bcda9f 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 ded17f38a618..ded17f38a618 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 89087a229eb7..89087a229eb7 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 bd1a77680663..bd1a77680663 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 1b77a895d717..1b77a895d717 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 092704c6fc3f..092704c6fc3f 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 ef71fe53d0c7..ef71fe53d0c7 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 498c2f25d1c0..498c2f25d1c0 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 cfc65b347bc6..cfc65b347bc6 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 2b22bdd9f0ae..2b22bdd9f0ae 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 6abac244dac2..6abac244dac2 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 1c4ee421fc56..1c4ee421fc56 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 be6acb3f1f53..be6acb3f1f53 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 62a499ea624d..62a499ea624d 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 997328ad9e6a..997328ad9e6a 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 246419b681af..246419b681af 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 55a48ea3c9c6..55a48ea3c9c6 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 5a17cb1da412..5a17cb1da412 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 fc9e7939d814..fc9e7939d814 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 bf474ac0a546..bf474ac0a546 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 93bdc851117a..93bdc851117a 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 89e71c5136e4..89e71c5136e4 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 8b131c54a2a5..8b131c54a2a5 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 c695ba075ca9..c695ba075ca9 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 7f1de81d5b70..7f1de81d5b70 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 1c643f2e1a57..1c643f2e1a57 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 d9d6d9c9f253..d9d6d9c9f253 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 f6dda21c6006..f6dda21c6006 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 573588aaeecc..573588aaeecc 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 cd4eb81dbe19..cd4eb81dbe19 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 dcb9c8d4ed5f..dcb9c8d4ed5f 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 494e9e93ac22..494e9e93ac22 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 687cdfb5ba57..687cdfb5ba57 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 c6b1b0cc0bd8..c6b1b0cc0bd8 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 c8fa9461a209..c8fa9461a209 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 c0f5d16ea11a..c0f5d16ea11a 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 27bfd91cd2d5..27bfd91cd2d5 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 302b94de1965..302b94de1965 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 376aad66e236..376aad66e236 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 6a8a0f9975b3..6a8a0f9975b3 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 aa3351f401af..aa3351f401af 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 3a047d10a631..3a047d10a631 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 a534b692f177..a534b692f177 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 0df8f9688d25..0df8f9688d25 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 9562ad1b164e..9562ad1b164e 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 8f94a2b49404..8f94a2b49404 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 b0b9264e8166..b0b9264e8166 100644
--- a/nixos/modules/services/audio/snapserver.nix
+++ b/nixpkgs/nixos/modules/services/audio/snapserver.nix
diff --git a/nixos/modules/services/audio/squeezelite.nix b/nixpkgs/nixos/modules/services/audio/squeezelite.nix
index 05506f5bcc7a..05506f5bcc7a 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 919b76622510..919b76622510 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 b845f370fb70..b845f370fb70 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 41bda7893a75..41bda7893a75 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 2ad116a7872a..2ad116a7872a 100644
--- a/nixos/modules/services/backup/borgbackup.nix
+++ b/nixpkgs/nixos/modules/services/backup/borgbackup.nix
diff --git a/nixos/modules/services/backup/crashplan-small-business.nix b/nixpkgs/nixos/modules/services/backup/crashplan-small-business.nix
index 790dafefe66f..790dafefe66f 100644
--- a/nixos/modules/services/backup/crashplan-small-business.nix
+++ b/nixpkgs/nixos/modules/services/backup/crashplan-small-business.nix
diff --git a/nixos/modules/services/backup/crashplan.nix b/nixpkgs/nixos/modules/services/backup/crashplan.nix
index c540cc6e2aee..c540cc6e2aee 100644
--- a/nixos/modules/services/backup/crashplan.nix
+++ b/nixpkgs/nixos/modules/services/backup/crashplan.nix
diff --git a/nixos/modules/services/backup/duplicati.nix b/nixpkgs/nixos/modules/services/backup/duplicati.nix
index 0ff720c5897d..0ff720c5897d 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 a8d564248623..a8d564248623 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 ba6e154f6b3d..ba6e154f6b3d 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 17b410a97f3e..17b410a97f3e 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/restic-rest-server.nix b/nixpkgs/nixos/modules/services/backup/restic-rest-server.nix
index d1b775f150dc..d1b775f150dc 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 7e8e91e4b9c3..7e8e91e4b9c3 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 bb5dcab1dcf2..bb5dcab1dcf2 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 4fc7c24813a5..4fc7c24813a5 100644
--- a/nixos/modules/services/backup/tarsnap.nix
+++ b/nixpkgs/nixos/modules/services/backup/tarsnap.nix
diff --git a/nixos/modules/services/backup/znapzend.nix b/nixpkgs/nixos/modules/services/backup/znapzend.nix
index 9c7f84655727..9c7f84655727 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 38db10406b9a..38db10406b9a 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 f0f5a6ecbfc5..f0f5a6ecbfc5 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 a38b6a78d3a5..a38b6a78d3a5 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 5345a2732d7e..5345a2732d7e 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 ad7d17c9c283..ad7d17c9c283 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 2295694ffc74..2295694ffc74 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 ee0ac632ecf0..ee0ac632ecf0 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 f293dd79f42a..f293dd79f42a 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 b94e8bd86d4c..b94e8bd86d4c 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 143b41f57f6a..143b41f57f6a 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 d9437427d6d1..d9437427d6d1 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 4c5df96bcc6a..4c5df96bcc6a 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 47384ae50a07..47384ae50a07 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 23f4d97b7030..23f4d97b7030 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 a0e484542951..a0e484542951 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 7022751b3f01..7022751b3f01 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 d1a1383e45b0..d1a1383e45b0 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 83772539a7ab..83772539a7ab 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 655d1500497e..655d1500497e 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 9c615fbe885f..9c615fbe885f 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 49e04ca36228..49e04ca36228 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 12cc3d2b1ccc..12cc3d2b1ccc 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 3ceaa6f5ff3e..3ceaa6f5ff3e 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 8126f27c2b0c..8126f27c2b0c 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 8f177da129e5..8f177da129e5 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 5d0c3f7b4ab3..5d0c3f7b4ab3 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 c7fe4eeeab99..c7fe4eeeab99 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 ec6a36413fe7..ec6a36413fe7 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 5d1bfe4ec407..5d1bfe4ec407 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 92deabc3dd3b..92deabc3dd3b 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/4store-endpoint.nix b/nixpkgs/nixos/modules/services/databases/4store-endpoint.nix
index 59ed0e5f0afd..59ed0e5f0afd 100644
--- a/nixos/modules/services/databases/4store-endpoint.nix
+++ b/nixpkgs/nixos/modules/services/databases/4store-endpoint.nix
diff --git a/nixos/modules/services/databases/4store.nix b/nixpkgs/nixos/modules/services/databases/4store.nix
index be4351c1c38f..be4351c1c38f 100644
--- a/nixos/modules/services/databases/4store.nix
+++ b/nixpkgs/nixos/modules/services/databases/4store.nix
diff --git a/nixos/modules/services/databases/aerospike.nix b/nixpkgs/nixos/modules/services/databases/aerospike.nix
index 4b905f90529d..4b905f90529d 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 a9da3a3c5620..a9da3a3c5620 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 dbabcae43ee5..dbabcae43ee5 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 268fdcc819fd..268fdcc819fd 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 5ddf8ba4bfbd..5ddf8ba4bfbd 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 042c9841df54..042c9841df54 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 3746b875c7f2..3746b875c7f2 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 b0b1ebeab45f..b0b1ebeab45f 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 589c8cf5ec80..589c8cf5ec80 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 6868050c8446..6868050c8446 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 052ff1f308eb..052ff1f308eb 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 5c66fc7b2e36..5c66fc7b2e36 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 c458a1d648a0..c458a1d648a0 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 df74cfc9a26b..df74cfc9a26b 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 5533182c3116..5533182c3116 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 c2f458c03794..c2f458c03794 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 b26fa9093ef4..b26fa9093ef4 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 1050c2dd481a..1050c2dd481a 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 5661edbee2db..5661edbee2db 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 00bb02dcc5bf..00bb02dcc5bf 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 c04cc1283b2e..c04cc1283b2e 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 4828e594b328..4828e594b328 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 2cb204f729a7..2cb204f729a7 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 ac086cf55996..ac086cf55996 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 97e55bc70c47..97e55bc70c47 100644
--- a/nixos/modules/services/databases/stanchion.nix
+++ b/nixpkgs/nixos/modules/services/databases/stanchion.nix
diff --git a/nixos/modules/services/databases/virtuoso.nix b/nixpkgs/nixos/modules/services/databases/virtuoso.nix
index 6ffc44a5274e..6ffc44a5274e 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 c48036a99e8f..c48036a99e8f 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 0928ee81a648..0928ee81a648 100644
--- a/nixos/modules/services/desktops/bamf.nix
+++ b/nixpkgs/nixos/modules/services/desktops/bamf.nix
diff --git a/nixos/modules/services/desktops/deepin/deepin.nix b/nixpkgs/nixos/modules/services/desktops/deepin/deepin.nix
index 931bac58aceb..931bac58aceb 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 7f88605f627c..7f88605f627c 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 9a131a5e700f..9a131a5e700f 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 cfca1893bd82..cfca1893bd82 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 fb27bd1f62b2..fb27bd1f62b2 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 040fe157d52d..040fe157d52d 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 cca98c43dc7a..cca98c43dc7a 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 2740a22c7ca0..2740a22c7ca0 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/evince.nix b/nixpkgs/nixos/modules/services/desktops/gnome3/evince.nix
index 5f040a16f067..5f040a16f067 100644
--- a/nixos/modules/services/desktops/gnome3/evince.nix
+++ b/nixpkgs/nixos/modules/services/desktops/gnome3/evince.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 7e312a1b81eb..7e312a1b81eb 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/file-roller.nix b/nixpkgs/nixos/modules/services/desktops/gnome3/file-roller.nix
index 7fb558a98953..7fb558a98953 100644
--- a/nixos/modules/services/desktops/gnome3/file-roller.nix
+++ b/nixpkgs/nixos/modules/services/desktops/gnome3/file-roller.nix
diff --git a/nixos/modules/services/desktops/gnome3/glib-networking.nix b/nixpkgs/nixos/modules/services/desktops/gnome3/glib-networking.nix
index 186668d7d385..186668d7d385 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-disks.nix b/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-disks.nix
index 139534cdb892..139534cdb892 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-disks.nix
+++ b/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-disks.nix
diff --git a/nixos/modules/services/desktops/gnome3/gnome-documents.nix b/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-documents.nix
index f6efb6684240..f6efb6684240 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-documents.nix
+++ b/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-documents.nix
diff --git a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix b/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-keyring.nix
index db60445ef773..db60445ef773 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 4286251357f7..4286251357f7 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 d406bf6f5e39..d406bf6f5e39 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 021f4f9534b4..021f4f9534b4 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 7f7adcf26acf..7f7adcf26acf 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-terminal-server.nix b/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix
index fd14efee5f2e..fd14efee5f2e 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix
+++ b/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-terminal-server.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 1f6ce2ae968e..1f6ce2ae968e 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/gpaste.nix b/nixpkgs/nixos/modules/services/desktops/gnome3/gpaste.nix
index 5a8258775e0a..5a8258775e0a 100644
--- a/nixos/modules/services/desktops/gnome3/gpaste.nix
+++ b/nixpkgs/nixos/modules/services/desktops/gnome3/gpaste.nix
diff --git a/nixos/modules/services/desktops/gnome3/gvfs.nix b/nixpkgs/nixos/modules/services/desktops/gnome3/gvfs.nix
index 4e99d191f18c..4e99d191f18c 100644
--- a/nixos/modules/services/desktops/gnome3/gvfs.nix
+++ b/nixpkgs/nixos/modules/services/desktops/gnome3/gvfs.nix
diff --git a/nixos/modules/services/desktops/gnome3/rygel.nix b/nixpkgs/nixos/modules/services/desktops/gnome3/rygel.nix
index 55d5e703aa19..55d5e703aa19 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/seahorse.nix b/nixpkgs/nixos/modules/services/desktops/gnome3/seahorse.nix
index 9631157934f9..9631157934f9 100644
--- a/nixos/modules/services/desktops/gnome3/seahorse.nix
+++ b/nixpkgs/nixos/modules/services/desktops/gnome3/seahorse.nix
diff --git a/nixos/modules/services/desktops/gnome3/sushi.nix b/nixpkgs/nixos/modules/services/desktops/gnome3/sushi.nix
index 7a4389038b22..7a4389038b22 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 20154fc2fed3..20154fc2fed3 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 c061f7890499..c061f7890499 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 5ab9add9f32d..5ab9add9f32d 100644
--- a/nixos/modules/services/desktops/gsignond.nix
+++ b/nixpkgs/nixos/modules/services/desktops/gsignond.nix
diff --git a/nixos/modules/services/desktops/pantheon/contractor.nix b/nixpkgs/nixos/modules/services/desktops/pantheon/contractor.nix
index 2638a21df733..2638a21df733 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 577aad6c2987..577aad6c2987 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 13f3d61e84ca..13f3d61e84ca 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 e4e47cfbd438..e4e47cfbd438 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/telepathy.nix b/nixpkgs/nixos/modules/services/desktops/telepathy.nix
index f5401c180984..f5401c180984 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 ccbb6d1434d9..ccbb6d1434d9 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 20c82ccdd56c..20c82ccdd56c 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 56904b7c40e6..56904b7c40e6 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 1a98f005602a..1a98f005602a 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 f20860af6e12..f20860af6e12 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 03547637449a..03547637449a 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/editors/emacs.nix b/nixpkgs/nixos/modules/services/editors/emacs.nix
index ba7ec967919e..ba7ec967919e 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 88d7c4e1daf0..88d7c4e1daf0 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 9cc8d421270e..9cc8d421270e 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 d04673a6c8b8..d04673a6c8b8 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 39a68f4b5536..39a68f4b5536 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 98e69c6dc0ea..98e69c6dc0ea 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/terraria.nix b/nixpkgs/nixos/modules/services/games/terraria.nix
index 31f8edca20ce..31f8edca20ce 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 4c97485d9726..4c97485d9726 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 4168140b287a..4168140b287a 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 c5f9d1f9b725..c5f9d1f9b725 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 32b60af06037..32b60af06037 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 1266e8f81e5b..1266e8f81e5b 100644
--- a/nixos/modules/services/hardware/brltty.nix
+++ b/nixpkgs/nixos/modules/services/hardware/brltty.nix
diff --git a/nixpkgs/nixos/modules/services/hardware/evscript.nix b/nixpkgs/nixos/modules/services/hardware/evscript.nix
new file mode 100644
index 000000000000..2d45ec513f49
--- /dev/null
+++ b/nixpkgs/nixos/modules/services/hardware/evscript.nix
@@ -0,0 +1,49 @@
+{ pkgs, lib, config, ... }:
+
+let
+  cfg = config.services.evscript;
+
+in
+{
+  options = with lib; {
+    services.evscript = {
+      enable = mkEnableOption "the evscript service";
+
+      package = mkOption {
+        description = "evscript package to use for the evscript service";
+        type = types.package;
+        default = pkgs.evscript;
+      };
+
+      devices = mkOption {
+        description = "evdev devices for evscript to listen to";
+        type = types.listOf types.path;
+        example = [ "/dev/input/by-path/pci-0000:00:1d.0-usb-0:1.1:1.0-event-kbd" ];
+      };
+
+      script = mkOption {
+        description = "Dyon script for evscript service to run";
+        type = types.path;
+      };
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    boot.kernelModules = [ "uinput" ];
+
+    services.udev.extraRules = ''
+      KERNEL=="uinput", MODE="0660", GROUP="input"
+    '';
+
+    systemd.services.evscript = {
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig.DynamicUser = true;
+      serviceConfig.SupplementaryGroups = [ "input" ];
+      script = ''
+        ${cfg.package}/bin/evscript \
+            ${lib.concatMapStringsSep " " (d: "-d ${d}") cfg.devices} \
+            -f ${cfg.script}
+      '';
+    };
+  };
+}
diff --git a/nixos/modules/services/hardware/freefall.nix b/nixpkgs/nixos/modules/services/hardware/freefall.nix
index 066ccaa4d7cf..066ccaa4d7cf 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 cad9fa20de0f..cad9fa20de0f 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 ff73c99a6537..ff73c99a6537 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 fadcb19a016f..fadcb19a016f 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 b139154432cf..b139154432cf 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 d78d742cd318..d78d742cd318 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 826e512c75d1..826e512c75d1 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 d53175052c74..d53175052c74 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 f3fc4c3cc79e..f3fc4c3cc79e 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 bf7d6a46a293..bf7d6a46a293 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 103e1d2315ae..103e1d2315ae 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 fe05c5a5c06f..fe05c5a5c06f 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 f6ed4e25e9cb..f6ed4e25e9cb 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 fd19d8020fb8..fd19d8020fb8 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 d71a17f5ea6b..d71a17f5ea6b 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 d4b0a9495d75..d4b0a9495d75 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 69577bbe0181..69577bbe0181 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 7c105e99ca54..7c105e99ca54 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 cd5b01450e44..cd5b01450e44 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 092ff051a042..092ff051a042 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 c06a0665d02f..c06a0665d02f 100644
--- a/nixos/modules/services/hardware/trezord.nix
+++ b/nixpkgs/nixos/modules/services/hardware/trezord.nix
diff --git a/nixos/modules/services/hardware/triggerhappy.nix b/nixpkgs/nixos/modules/services/hardware/triggerhappy.nix
index a500cb4fc367..a500cb4fc367 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 bb4b2f05f890..bb4b2f05f890 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 83ab93bd7cfc..83ab93bd7cfc 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 ed8703be921c..ed8703be921c 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 e5ef0601de3c..e5ef0601de3c 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 1da47349c077..1da47349c077 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 93ced0b9f04d..93ced0b9f04d 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 6e246f70f515..6e246f70f515 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 e90d9e7a12b6..e90d9e7a12b6 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 612ae06d0a79..612ae06d0a79 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 95825705d9d7..95825705d9d7 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 c8c4a9ff06db..c8c4a9ff06db 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 56fb4deabda5..56fb4deabda5 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 89f53b1b2454..89f53b1b2454 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 9bd581e9ec0e..9bd581e9ec0e 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 576c646c0f58..576c646c0f58 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 2d1f515da920..2d1f515da920 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 f139190a1709..f139190a1709 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 fdd9f0f3e5c2..fdd9f0f3e5c2 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 9b707e9deb58..9b707e9deb58 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 1ea96b8f1325..1ea96b8f1325 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 65e103ac2ba5..65e103ac2ba5 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 fe0b0490811d..fe0b0490811d 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 fc1267c5d280..fc1267c5d280 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 5b5cc294e5c7..5b5cc294e5c7 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 f4ac9e47007a..f4ac9e47007a 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 139011dca23a..139011dca23a 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 72b8c4c08b92..72b8c4c08b92 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 c05811291359..c05811291359 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 5b729ca50a5e..5b729ca50a5e 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 fed313e4738e..fed313e4738e 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 fa8d41e918d3..fa8d41e918d3 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 b78f4c8e0e66..b78f4c8e0e66 100644
--- a/nixos/modules/services/mail/mailhog.nix
+++ b/nixpkgs/nixos/modules/services/mail/mailhog.nix
diff --git a/nixos/modules/services/mail/mlmmj.nix b/nixpkgs/nixos/modules/services/mail/mlmmj.nix
index 11565bc02f89..11565bc02f89 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 9997d287013e..9997d287013e 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 294e3806f94a..294e3806f94a 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 253823cbaf9c..253823cbaf9c 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 a870550ba50b..a870550ba50b 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 9599854352c9..9599854352c9 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 d43733484ffa..d43733484ffa 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 8e2b9c5dbc56..8e2b9c5dbc56 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 8f12a16906c5..8f12a16906c5 100644
--- a/nixos/modules/services/mail/postsrsd.nix
+++ b/nixpkgs/nixos/modules/services/mail/postsrsd.nix
diff --git a/nixos/modules/services/mail/rmilter.nix b/nixpkgs/nixos/modules/services/mail/rmilter.nix
index 466365b6b305..466365b6b305 100644
--- a/nixos/modules/services/mail/rmilter.nix
+++ b/nixpkgs/nixos/modules/services/mail/rmilter.nix
diff --git a/nixos/modules/services/mail/roundcube.nix b/nixpkgs/nixos/modules/services/mail/roundcube.nix
index e8b2e11bf726..e8b2e11bf726 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 5541b8b79b7e..5541b8b79b7e 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 a123736005ab..a123736005ab 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 1fe77ce5a0c7..1fe77ce5a0c7 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 8b2ec82c7705..8b2ec82c7705 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 9eeae9556992..9eeae9556992 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 f1742177326a..f1742177326a 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 4708e16e2a6c..4708e16e2a6c 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 06e881406b52..06e881406b52 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 b0ed2d5c2862..b0ed2d5c2862 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 87d360681445..87d360681445 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 84c04f403d3a..84c04f403d3a 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 db51a263aab5..db51a263aab5 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 dcf416022734..dcf416022734 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 b1cf5a7d1104..b1cf5a7d1104 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 3ba050044cac..3ba050044cac 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 8e9bec15dd4f..8e9bec15dd4f 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 528af486b414..528af486b414 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 f31526f8d107..f31526f8d107 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 0b58c59c7a51..0b58c59c7a51 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 9dc8fee2964b..9dc8fee2964b 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 8d3e294622d1..d7b0997a1fc5 100644
--- a/nixos/modules/services/misc/dictd.nix
+++ b/nixpkgs/nixos/modules/services/misc/dictd.nix
@@ -45,6 +45,10 @@ in
     # get the command line client on system path to make some use of the service
     environment.systemPackages = [ pkgs.dict ];
 
+    environment.etc."dict.conf".text = ''
+      server localhost
+    '';
+
     users.users = singleton
       { name = "dictd";
         group = "dictd";
diff --git a/nixos/modules/services/misc/disnix.nix b/nixpkgs/nixos/modules/services/misc/disnix.nix
index c21cb2afc3ca..c21cb2afc3ca 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 c87607d2666a..c87607d2666a 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/dysnomia.nix b/nixpkgs/nixos/modules/services/misc/dysnomia.nix
index 61ea822890ed..61ea822890ed 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 256adce2f02e..256adce2f02e 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 e4d5322f9b5f..e4d5322f9b5f 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 2958cf214473..2958cf214473 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 665084a8ae05..665084a8ae05 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 1c5ece868258..1c5ece868258 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 122c89ce0680..122c89ce0680 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/fstrim.nix b/nixpkgs/nixos/modules/services/misc/fstrim.nix
index 15f283f093c0..15f283f093c0 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 3057d7fd1a09..3057d7fd1a09 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 baf0a8d73d19..baf0a8d73d19 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 5a964e672ede..5a964e672ede 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 1ec030549f98..1ec030549f98 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 576ca7bfc055..576ca7bfc055 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 5ff570a442f6..5ff570a442f6 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 c7f2a168f8ab..c7f2a168f8ab 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 ca21366b7796..ca21366b7796 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 ee99967c261b..ee99967c261b 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 7653b415bf09..7653b415bf09 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 3bfcb636a3c6..3bfcb636a3c6 100644
--- a/nixos/modules/services/misc/gpsd.nix
+++ b/nixpkgs/nixos/modules/services/misc/gpsd.nix
diff --git a/nixos/modules/services/misc/headphones.nix b/nixpkgs/nixos/modules/services/misc/headphones.nix
index 4a77045be28e..4a77045be28e 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 f1b351246740..f1b351246740 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 11597706d0d1..11597706d0d1 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 993d77ba424c..993d77ba424c 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 f2dc6635df93..f2dc6635df93 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 55559206568d..55559206568d 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 d4e88ecbebdb..d4e88ecbebdb 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 40755c162171..40755c162171 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 ad13d9eaa674..ad13d9eaa674 100644
--- a/nixos/modules/services/misc/logkeys.nix
+++ b/nixpkgs/nixos/modules/services/misc/logkeys.nix
diff --git a/nixos/modules/services/misc/mantisbt.nix b/nixpkgs/nixos/modules/services/misc/mantisbt.nix
index 7e3474feb672..7e3474feb672 100644
--- a/nixos/modules/services/misc/mantisbt.nix
+++ b/nixpkgs/nixos/modules/services/misc/mantisbt.nix
diff --git a/nixos/modules/services/misc/mathics.nix b/nixpkgs/nixos/modules/services/misc/mathics.nix
index c588a30d76cd..c588a30d76cd 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 d85bdd1208f9..d85bdd1208f9 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 00c8e7408030..00c8e7408030 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 e22d1ed61f99..e22d1ed61f99 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 e8e9c0946d7f..e8e9c0946d7f 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 572a9847e46c..572a9847e46c 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 170065d0065e..170065d0065e 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/mwlib.nix b/nixpkgs/nixos/modules/services/misc/mwlib.nix
index a8edecff2a1e..a8edecff2a1e 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 d8f90f1539c1..d8f90f1539c1 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 12bed05757ad..12bed05757ad 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 416529f690e0..416529f690e0 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 7ce3841be2f5..7ce3841be2f5 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 df3e71c80dea..df3e71c80dea 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 7cfc68d2b673..7cfc68d2b673 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 eb7b4c05d82d..eb7b4c05d82d 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 8950010773cf..8950010773cf 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 f89f37ccd9df..f89f37ccd9df 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 325c4e84e0d8..325c4e84e0d8 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 4e6cd80e2425..4e6cd80e2425 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 c757093e5c1b..c757093e5c1b 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 7efadf1b9bb1..7efadf1b9bb1 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 ef90d124a284..ef90d124a284 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 74444e24043f..74444e24043f 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 91ddf2c3edf3..91ddf2c3edf3 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 042b496d35ee..042b496d35ee 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 cdf61730de33..cdf61730de33 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 aae02e384c97..aae02e384c97 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 1a33971d9227..1a33971d9227 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 8808f2d21931..8808f2d21931 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 5cfbbe516ae1..5cfbbe516ae1 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 dcaf73aca448..dcaf73aca448 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 62b344d11b06..62b344d11b06 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 77c7f0582d0b..77c7f0582d0b 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 2dd9fcf68ab0..2dd9fcf68ab0 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 e951a4c7ffa8..e951a4c7ffa8 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 6b64045dde88..6b64045dde88 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 1612b197f35f..1612b197f35f 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 e3234518c940..e3234518c940 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 6292bc52b1e3..6292bc52b1e3 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 b89cb41ac3ad..b89cb41ac3ad 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 ab91a8b586a2..ab91a8b586a2 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 07dbee69db0c..07dbee69db0c 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 5656bb85b373..5656bb85b373 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 22a3d8d5311b..22a3d8d5311b 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 50e450366478..50e450366478 100644
--- a/nixos/modules/services/misc/tautulli.nix
+++ b/nixpkgs/nixos/modules/services/misc/tautulli.nix
diff --git a/nixos/modules/services/misc/tzupdate.nix b/nixpkgs/nixos/modules/services/misc/tzupdate.nix
index 570982ced29a..570982ced29a 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 005951b9231e..005951b9231e 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 c6ff540ea12f..c6ff540ea12f 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 7255edfb9da3..7255edfb9da3 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 a87878c31e0d..a87878c31e0d 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 cf56ae89b399..cf56ae89b399 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 50c84e3c6b80..50c84e3c6b80 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 34f2d41706a5..34f2d41706a5 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 49957e652900..49957e652900 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 b41a3c7b5016..b41a3c7b5016 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 8bf741adb6e3..8bf741adb6e3 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 6ca420a05b23..6ca420a05b23 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 6a4c678eb21f..6a4c678eb21f 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 88ca3a9227d2..88ca3a9227d2 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 ce3d53fb2c17..ce3d53fb2c17 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 045128197421..045128197421 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 abc8d65d58f2..abc8d65d58f2 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 76724173171a..76724173171a 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/fusion-inventory.nix b/nixpkgs/nixos/modules/services/monitoring/fusion-inventory.nix
index 9c976c65ea49..9c976c65ea49 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 b5a78e4583e1..b5a78e4583e1 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 5d3f2e6ac28f..5d3f2e6ac28f 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 d6473220c140..d6473220c140 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 2cad3b84d847..2cad3b84d847 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 fbdff2eb5dbe..fbdff2eb5dbe 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 1789fd9f2051..1789fd9f2051 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 0f236d25c9ed..0f236d25c9ed 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 4d11360d07e9..4d11360d07e9 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 9c38956f9ba8..9c38956f9ba8 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 32e14ab21ffc..32e14ab21ffc 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 ffe223fedbe1..ffe223fedbe1 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 6a3b97769462..6a3b97769462 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 f9b7550af23a..f9b7550af23a 100644
--- a/nixos/modules/services/monitoring/netdata.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/netdata.nix
diff --git a/nixos/modules/services/monitoring/osquery.nix b/nixpkgs/nixos/modules/services/monitoring/osquery.nix
index c8c625577d39..c8c625577d39 100644
--- a/nixos/modules/services/monitoring/osquery.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/osquery.nix
diff --git a/nixos/modules/services/monitoring/prometheus/alertmanager.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/alertmanager.nix
index 11d85e9c4fc3..11d85e9c4fc3 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 d8384e0d35b3..d8384e0d35b3 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 20e7eba43412..20e7eba43412 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 81ac998729be..81ac998729be 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 a9746c4d65d5..a9746c4d65d5 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 d09d1c4f3663..d09d1c4f3663 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 0eba3527162d..0eba3527162d 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 b1fab85109af..b1fab85109af 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 c47e87a3dc35..c47e87a3dc35 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 530206681d36..530206681d36 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 a5494e85e016..a5494e85e016 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/minio.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/minio.nix
index 3cc4ffdbc8fd..3cc4ffdbc8fd 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/nginx.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix
index 431dd8b4ead7..431dd8b4ead7 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 8c4128f9b634..8c4128f9b634 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 efe78ebcba86..efe78ebcba86 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/snmp.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix
index 0d9194124325..0d9194124325 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 715dba06a3dc..715dba06a3dc 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 e0ae83802425..e0ae83802425 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 011dcbe208e4..011dcbe208e4 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 aaed76175b84..aaed76175b84 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 c5b84e574b8d..c5b84e574b8d 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 f8fcc3eb97ef..f8fcc3eb97ef 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 16eb83008509..16eb83008509 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 9c400a1e3e46..9c400a1e3e46 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 13d2b1cc0602..13d2b1cc0602 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 dc0899c7e684..dc0899c7e684 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 c345ec48a018..c345ec48a018 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 ea155821ecc9..ea155821ecc9 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 d668faa53cc3..d668faa53cc3 100644
--- a/nixos/modules/services/monitoring/sysstat.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/sysstat.nix
diff --git a/nixos/modules/services/monitoring/systemhealth.nix b/nixpkgs/nixos/modules/services/monitoring/systemhealth.nix
index 32d4314d5f77..32d4314d5f77 100644
--- a/nixos/modules/services/monitoring/systemhealth.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/systemhealth.nix
diff --git a/nixos/modules/services/monitoring/teamviewer.nix b/nixpkgs/nixos/modules/services/monitoring/teamviewer.nix
index dd98ecab828d..dd98ecab828d 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 d87867326682..d87867326682 100644
--- a/nixos/modules/services/monitoring/telegraf.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/telegraf.nix
diff --git a/nixos/modules/services/monitoring/ups.nix b/nixpkgs/nixos/modules/services/monitoring/ups.nix
index bc755612fd9b..bc755612fd9b 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 c0993f3bc2e7..c0993f3bc2e7 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 e9bedb704a43..e9bedb704a43 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 0519e7c2ad6a..0519e7c2ad6a 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-server.nix b/nixpkgs/nixos/modules/services/monitoring/zabbix-server.nix
index fdeab6af4417..fdeab6af4417 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/beegfs.nix b/nixpkgs/nixos/modules/services/network-filesystems/beegfs.nix
index 86b1bb9160f1..86b1bb9160f1 100644
--- a/nixos/modules/services/network-filesystems/beegfs.nix
+++ b/nixpkgs/nixos/modules/services/network-filesystems/beegfs.nix
diff --git a/nixos/modules/services/network-filesystems/cachefilesd.nix b/nixpkgs/nixos/modules/services/network-filesystems/cachefilesd.nix
index 619813408405..619813408405 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 4e3bc839d400..4e3bc839d400 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 c16e12378d75..c16e12378d75 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 063bae6ddb1d..063bae6ddb1d 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 57b1fbb597c7..57b1fbb597c7 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 00875c6c4a18..00875c6c4a18 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 f19bf9d81396..f19bf9d81396 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 7b2eea3b5850..7b2eea3b5850 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 1dd869043f0c..1dd869043f0c 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 1a78f9a76a33..1a78f9a76a33 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 79c4b7aee066..79c4b7aee066 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 1cc9bed847ab..1cc9bed847ab 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 095024d2c8af..095024d2c8af 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/rsyncd.nix b/nixpkgs/nixos/modules/services/network-filesystems/rsyncd.nix
index 054057d52ab1..054057d52ab1 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 69368441c62c..69368441c62c 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 7d75eb286106..7d75eb286106 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 4f37fc2a9e5c..4f37fc2a9e5c 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 c93e201da56c..c93e201da56c 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 e93f45b49867..e93f45b49867 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/amuled.nix b/nixpkgs/nixos/modules/services/networking/amuled.nix
index 57f02542eafd..57f02542eafd 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 53829bf18863..53829bf18863 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 03a2544b9a7e..03a2544b9a7e 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 e7fd48c99a85..e7fd48c99a85 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 a098a155e991..a098a155e991 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 ddcfe3d77e2f..ddcfe3d77e2f 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 3dfd80f6ff52..3dfd80f6ff52 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 7f89cff22329..7f89cff22329 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 4ae35875c0f0..4ae35875c0f0 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 d3501636b41d..d3501636b41d 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 274b36171608..274b36171608 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 e3aba063f87b..e3aba063f87b 100644
--- a/nixos/modules/services/networking/charybdis.nix
+++ b/nixpkgs/nixos/modules/services/networking/charybdis.nix
diff --git a/nixos/modules/services/networking/chrony.nix b/nixpkgs/nixos/modules/services/networking/chrony.nix
index 77f702577000..77f702577000 100644
--- a/nixos/modules/services/networking/chrony.nix
+++ b/nixpkgs/nixos/modules/services/networking/chrony.nix
diff --git a/nixos/modules/services/networking/cjdns.nix b/nixpkgs/nixos/modules/services/networking/cjdns.nix
index c40962f4aa82..c40962f4aa82 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 4e4e3104c3a8..4e4e3104c3a8 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 c3ca6fbe725e..c3ca6fbe725e 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 3a92a883fbf8..3a92a883fbf8 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 afb2b547a465..afb2b547a465 100644
--- a/nixos/modules/services/networking/coredns.nix
+++ b/nixpkgs/nixos/modules/services/networking/coredns.nix
diff --git a/nixos/modules/services/networking/coturn.nix b/nixpkgs/nixos/modules/services/networking/coturn.nix
index c430ce5af92a..c430ce5af92a 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 20d4faa1cdb1..20d4faa1cdb1 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 04ce5ca3a874..04ce5ca3a874 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 c217ccaa405a..c217ccaa405a 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 0b2063bc4246..0b2063bc4246 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 5051fc916d96..5051fc916d96 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 0c2add424bac..0c2add424bac 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 8edcf925dbfa..8edcf925dbfa 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 afc7880392a1..afc7880392a1 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 bf13d5c6f5fe..bf13d5c6f5fe 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 12eee136e639..12eee136e639 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 24d16046c63e..24d16046c63e 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 6a38f85c48a2..6a38f85c48a2 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 692b75e4f086..692b75e4f086 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 be7337ece7e4..be7337ece7e4 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 82a9fb729d84..82a9fb729d84 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 07338ccf4d9c..07338ccf4d9c 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 6842aa735617..6842aa735617 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 0b34f0b6b8b4..0b34f0b6b8b4 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 4ea891262e56..4ea891262e56 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 dd2f6454e954..dd2f6454e954 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 9c51b88ef677..9c51b88ef677 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 3da3ab0c7df4..3da3ab0c7df4 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 e192b70c129c..e192b70c129c 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 7083d87c4073..7083d87c4073 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 4456a95402ed..4456a95402ed 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 3d829cb69135..3d829cb69135 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 c0020349ec74..c0020349ec74 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 178a832c166e..178a832c166e 100644
--- a/nixos/modules/services/networking/gnunet.nix
+++ b/nixpkgs/nixos/modules/services/networking/gnunet.nix
diff --git a/nixos/modules/services/networking/gogoclient.nix b/nixpkgs/nixos/modules/services/networking/gogoclient.nix
index 9d16f0efb435..9d16f0efb435 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 3ef3548e0a08..3ef3548e0a08 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 20e57e4626ef..20e57e4626ef 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 0438d0bf8d86..0438d0bf8d86 100644
--- a/nixos/modules/services/networking/haproxy.nix
+++ b/nixpkgs/nixos/modules/services/networking/haproxy.nix
diff --git a/nixos/modules/services/networking/heyefi.nix b/nixpkgs/nixos/modules/services/networking/heyefi.nix
index fc2b5a848578..fc2b5a848578 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 54a5bed2563f..54a5bed2563f 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 6954e5b060c4..6954e5b060c4 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 d8ffa3fc04d2..d8ffa3fc04d2 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 9b634650cf79..9b634650cf79 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 8c39e9d20c18..8c39e9d20c18 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 8999dae57f41..8999dae57f41 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 7529b5b0aafd..7529b5b0aafd 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 4ac6d3fa8432..4ac6d3fa8432 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 31e930e8c597..31e930e8c597 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 ef177e4be345..ef177e4be345 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 3b6010531f13..3b6010531f13 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 f2be417738ee..f2be417738ee 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 344f84374bbd..344f84374bbd 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 0fe378b225d7..0fe378b225d7 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 38312210df25..38312210df25 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 312dfaada329..312dfaada329 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 2bd898edf897..2bd898edf897 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 17ef203840af..17ef203840af 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 18ed20e28886..18ed20e28886 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 c9ac2ee25990..c9ac2ee25990 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 1b8889b1b472..1b8889b1b472 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 85b9bc337726..85b9bc337726 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 a3f794c40a89..a3f794c40a89 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 a149f16a84cb..a149f16a84cb 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 40c38254a57c..40c38254a57c 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 1cc1dd3f2f62..1cc1dd3f2f62 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 ca34ff9df4ef..ca34ff9df4ef 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 b7c8bd008fe1..b7c8bd008fe1 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 280158b89f61..280158b89f61 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 d5de9c45d84b..d5de9c45d84b 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 406626a8a343..406626a8a343 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 c42d3d5a44cb..c42d3d5a44cb 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 1fd63348c16c..1fd63348c16c 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 ed0c1044a570..ed0c1044a570 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 c095d9948546..c095d9948546 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 2c8393fb5b41..2c8393fb5b41 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 e0a6c112e3cb..e0a6c112e3cb 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 831e4d60d8da..831e4d60d8da 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 cc81e27e9399..cc81e27e9399 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 1d49c137723c..1d49c137723c 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 5d1fc4a65427..5d1fc4a65427 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 24bf33815da8..24bf33815da8 100644
--- a/nixos/modules/services/networking/mtprotoproxy.nix
+++ b/nixpkgs/nixos/modules/services/networking/mtprotoproxy.nix
diff --git a/nixos/modules/services/networking/murmur.nix b/nixpkgs/nixos/modules/services/networking/murmur.nix
index 7ac4d0c6419d..7ac4d0c6419d 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 02e89f441b34..02e89f441b34 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 a569ca87e262..a569ca87e262 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 89d8590093dd..89d8590093dd 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 ba17f1ba825a..ba17f1ba825a 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 f1f8c9722e02..f1f8c9722e02 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 ad7c013a5449..ad7c013a5449 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 6523f4b8b9e0..6523f4b8b9e0 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 eb559e926e76..eb559e926e76 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 d6e1906e3881..d6e1906e3881 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 33c8572bd14f..33c8572bd14f 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 887ef4502131..887ef4502131 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 51f1d081b971..51f1d081b971 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 ef23bfd793c5..ef23bfd793c5 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 8f3cdaae2c81..8f3cdaae2c81 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 4b2fa7795922..4b2fa7795922 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 ca458d089dcc..ca458d089dcc 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 2bb1263b7fa2..2bb1263b7fa2 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 d24d6f77a491..d24d6f77a491 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 8b918dab86dd..8b918dab86dd 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 c15257117137..c15257117137 100644
--- a/nixos/modules/services/networking/ntopng.nix
+++ b/nixpkgs/nixos/modules/services/networking/ntopng.nix
diff --git a/nixos/modules/services/networking/ntpd.nix b/nixpkgs/nixos/modules/services/networking/ntpd.nix
index 588d1c6edb07..588d1c6edb07 100644
--- a/nixos/modules/services/networking/ntpd.nix
+++ b/nixpkgs/nixos/modules/services/networking/ntpd.nix
diff --git a/nixos/modules/services/networking/nullidentdmod.nix b/nixpkgs/nixos/modules/services/networking/nullidentdmod.nix
index b0d338a27941..b0d338a27941 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 b061ce34ed2c..b061ce34ed2c 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 dc26ffeafeef..dc26ffeafeef 100644
--- a/nixos/modules/services/networking/ocserv.nix
+++ b/nixpkgs/nixos/modules/services/networking/ocserv.nix
diff --git a/nixos/modules/services/networking/oidentd.nix b/nixpkgs/nixos/modules/services/networking/oidentd.nix
index feb84806ba99..feb84806ba99 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 4059eb3db83d..4059eb3db83d 100644
--- a/nixos/modules/services/networking/openfire.nix
+++ b/nixpkgs/nixos/modules/services/networking/openfire.nix
diff --git a/nixos/modules/services/networking/openntpd.nix b/nixpkgs/nixos/modules/services/networking/openntpd.nix
index 57638ebc9c01..57638ebc9c01 100644
--- a/nixos/modules/services/networking/openntpd.nix
+++ b/nixpkgs/nixos/modules/services/networking/openntpd.nix
diff --git a/nixos/modules/services/networking/openvpn.nix b/nixpkgs/nixos/modules/services/networking/openvpn.nix
index f47122ee70bf..f47122ee70bf 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 13f784dc53c1..13f784dc53c1 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 821a0258f4be..821a0258f4be 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 d07deb9dcc67..d07deb9dcc67 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 f5b174dd7b7b..f5b174dd7b7b 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 529115a1c6e1..529115a1c6e1 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 ba05e15389f6..ba05e15389f6 100644
--- a/nixos/modules/services/networking/powerdns.nix
+++ b/nixpkgs/nixos/modules/services/networking/powerdns.nix
diff --git a/nixos/modules/services/networking/pptpd.nix b/nixpkgs/nixos/modules/services/networking/pptpd.nix
index d8b9e8f8341a..d8b9e8f8341a 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 c936417e68cb..c936417e68cb 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 49ca839a2c37..49ca839a2c37 100644
--- a/nixos/modules/services/networking/privoxy.nix
+++ b/nixpkgs/nixos/modules/services/networking/privoxy.nix
diff --git a/nixos/modules/services/networking/prosody.nix b/nixpkgs/nixos/modules/services/networking/prosody.nix
index 40bd9015b1eb..40bd9015b1eb 100644
--- a/nixos/modules/services/networking/prosody.nix
+++ b/nixpkgs/nixos/modules/services/networking/prosody.nix
diff --git a/nixos/modules/services/networking/quagga.nix b/nixpkgs/nixos/modules/services/networking/quagga.nix
index 5acdd5af8f8f..5acdd5af8f8f 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 b495b3948fb5..b495b3948fb5 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 5bcf923f909c..5bcf923f909c 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 328f4cb1497f..328f4cb1497f 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 d6fabbcd4700..d6fabbcd4700 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 020faa34922a..020faa34922a 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 887772f6e5f0..887772f6e5f0 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 8481f9debf39..8481f9debf39 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 ee7f82ac7bee..ee7f82ac7bee 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 0a5df6987092..0a5df6987092 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 a6a069ec50c0..a6a069ec50c0 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 62b24d4377f8..62b24d4377f8 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 9412d0ef8a62..9412d0ef8a62 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 40729225b6d0..40729225b6d0 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 fe6d65a5f963..fe6d65a5f963 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 68e005ab81da..68e005ab81da 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/shout.nix b/nixpkgs/nixos/modules/services/networking/shout.nix
index f511a9af2562..f511a9af2562 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 6ad18bb22403..6ad18bb22403 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 c41d0edaf17f..c41d0edaf17f 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 0345c12d3afe..0345c12d3afe 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 0046dcd366fa..0046dcd366fa 100644
--- a/nixos/modules/services/networking/softether.nix
+++ b/nixpkgs/nixos/modules/services/networking/softether.nix
diff --git a/nixos/modules/services/networking/spiped.nix b/nixpkgs/nixos/modules/services/networking/spiped.nix
index e60d9abf42a6..e60d9abf42a6 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 9d063b92aa1e..9d063b92aa1e 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 eca599afb33b..eca599afb33b 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 0f9d2420903b..0f9d2420903b 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 0222e8ce8b58..0222e8ce8b58 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 817b5ec55f78..817b5ec55f78 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 95a174122d04..95a174122d04 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 193ad27f035a..193ad27f035a 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 808cb863a9cf..808cb863a9cf 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 41b69039ba7a..41b69039ba7a 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 3fbf6eb60e9d..3fbf6eb60e9d 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 89a14966eca7..89a14966eca7 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 35c1e649e2e1..35c1e649e2e1 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 64eb11068329..64eb11068329 100644
--- a/nixos/modules/services/networking/supybot.nix
+++ b/nixpkgs/nixos/modules/services/networking/supybot.nix
diff --git a/nixos/modules/services/networking/syncthing-relay.nix b/nixpkgs/nixos/modules/services/networking/syncthing-relay.nix
index f5ca63e78930..f5ca63e78930 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 d78a54a3327b..d78a54a3327b 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 a0ccb9950094..a0ccb9950094 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 fadb32dcd777..fadb32dcd777 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 0716975f594a..0716975f594a 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 c9c0a2b321d5..c9c0a2b321d5 100644
--- a/nixos/modules/services/networking/tftpd.nix
+++ b/nixpkgs/nixos/modules/services/networking/tftpd.nix
diff --git a/nixos/modules/services/networking/tinc.nix b/nixpkgs/nixos/modules/services/networking/tinc.nix
index e98aafc20937..e98aafc20937 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 7d5db71601ef..7d5db71601ef 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 1d3492151690..1d3492151690 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 c24e7fd12850..c24e7fd12850 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 7830dfb1834c..7830dfb1834c 100644
--- a/nixos/modules/services/networking/toxvpn.nix
+++ b/nixpkgs/nixos/modules/services/networking/toxvpn.nix
diff --git a/nixos/modules/services/networking/tvheadend.nix b/nixpkgs/nixos/modules/services/networking/tvheadend.nix
index ccf879996631..ccf879996631 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 1a35979ad44c..1a35979ad44c 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 9057a1e12b33..9057a1e12b33 100644
--- a/nixos/modules/services/networking/unifi.nix
+++ b/nixpkgs/nixos/modules/services/networking/unifi.nix
diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixpkgs/nixos/modules/services/networking/vsftpd.nix
index 31e1e65fa9ca..31e1e65fa9ca 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 ebfba263cd8f..ebfba263cd8f 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 4b76350ecf8a..4b76350ecf8a 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 b770d47d269e..b770d47d269e 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 03c6bd28aaba..03c6bd28aaba 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 4176da2c8cb8..4176da2c8cb8 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 0bd9edf4a41c..0bd9edf4a41c 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/xinetd.nix b/nixpkgs/nixos/modules/services/networking/xinetd.nix
index 2d7cd5cebb48..2d7cd5cebb48 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 d0a3ed7bb5e0..d0a3ed7bb5e0 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 b7dd1c5d99dd..b7dd1c5d99dd 100644
--- a/nixos/modules/services/networking/xrdp.nix
+++ b/nixpkgs/nixos/modules/services/networking/xrdp.nix
diff --git a/nixos/modules/services/networking/zerobin.nix b/nixpkgs/nixos/modules/services/networking/zerobin.nix
index 06ccd7032e6c..06ccd7032e6c 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 f4988a902685..f4988a902685 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 764af3846fe5..764af3846fe5 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 46bff6954cdd..46bff6954cdd 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 048dbd738630..048dbd738630 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 86b0c8d69beb..86b0c8d69beb 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 a32907647a0d..a32907647a0d 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 9a8ed4c09ac1..9a8ed4c09ac1 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 3bc31832946b..3bc31832946b 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 f77b3bcd5921..f77b3bcd5921 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 0961a67770e1..0961a67770e1 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 9620c3e0b6d4..9620c3e0b6d4 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 6b688c640d59..6b688c640d59 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 6740928db9a7..6740928db9a7 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 c096af731ad4..c096af731ad4 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 5ef7d9893a49..5ef7d9893a49 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 264a7da9cbb6..264a7da9cbb6 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 bb036ee020f4..bb036ee020f4 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 e89078883ebe..e89078883ebe 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 ee6d5d91fe15..ee6d5d91fe15 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 04b433f8f2bf..04b433f8f2bf 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 716ae7a2d2f4..716ae7a2d2f4 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 5662ebc61d20..5662ebc61d20 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 b1ca4ab23452..b1ca4ab23452 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 b64a1b4d03e0..b64a1b4d03e0 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 eca529188810..eca529188810 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 a5087b0a99b4..a5087b0a99b4 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 bad02c7440ba..bad02c7440ba 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 1c4f8e20552f..1c4f8e20552f 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 d792f90abe64..d792f90abe64 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 61f203ef9e7d..61f203ef9e7d 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 a9ad5497a657..a9ad5497a657 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 97fbd6aae6e0..97fbd6aae6e0 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 5908f727d535..5908f727d535 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 1b7a2ad13980..1b7a2ad13980 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 3892cd5c72b8..3892cd5c72b8 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 6f4852c3ba1a..6f4852c3ba1a 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 08da726437ea..08da726437ea 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 c60c745443bc..c60c745443bc 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 88d2f69db572..88d2f69db572 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 8176c168ca94..8176c168ca94 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 59d3deced867..59d3deced867 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 3ad555f78ef8..3ad555f78ef8 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 e04580218442..e04580218442 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 39d1bf274bd2..39d1bf274bd2 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 c55241c4cff1..c55241c4cff1 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 f0e56c7951a4..f0e56c7951a4 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 25d7d51e808a..25d7d51e808a 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 04595fc82fbb..04595fc82fbb 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 603a5d01acce..603a5d01acce 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 fd1570d11980..fd1570d11980 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 8fcf4fb91fc4..8fcf4fb91fc4 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 3c9978ab2269..3c9978ab2269 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 01a5890a7845..01a5890a7845 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 ca63f529a5df..ca63f529a5df 100644
--- a/nixos/modules/services/torrent/flexget.nix
+++ b/nixpkgs/nixos/modules/services/torrent/flexget.nix
diff --git a/nixos/modules/services/torrent/opentracker.nix b/nixpkgs/nixos/modules/services/torrent/opentracker.nix
index 74f443381d92..74f443381d92 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 a74f65984328..a74f65984328 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 f544928fb6b1..f544928fb6b1 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 b50de496e975..448b7c59e2ac 100644
--- a/nixos/modules/services/ttys/agetty.nix
+++ b/nixpkgs/nixos/modules/services/ttys/agetty.nix
@@ -3,9 +3,20 @@
 with lib;
 
 let
+  cfg = config.services.mingetty;
 
-  autologinArg = optionalString (config.services.mingetty.autologinUser != null) "--autologin ${config.services.mingetty.autologinUser}";
-  gettyCmd = extraArgs: "@${pkgs.utillinux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login ${autologinArg} ${extraArgs}";
+  loginArgs = concatStringsSep " " [
+    "--login-program ${pkgs.shadow}/bin/login"
+
+    (optionalString (cfg.autologinUser != null)
+                    "--autologin ${cfg.autologinUser}")
+
+    (optionalString (cfg.loginOptions != null)
+                    "--login-options ${escapeShellArg cfg.loginOptions}")
+  ];
+
+  gettyCmd = extraArgs:
+    "@${pkgs.utillinux}/sbin/agetty agetty ${loginArgs} ${extraArgs}";
 
 in
 
@@ -26,6 +37,17 @@ in
         '';
       };
 
+      loginOptions = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = ''
+          Template for arguments to be passed to login(1).
+          See agetty(1) for details, including security considerations.
+          If unspecified, agetty will not be invoked with a --login-options option.
+        '';
+        example = "-h darkstar -- \u";
+      };
+
       greetingLine = mkOption {
         type = types.str;
         description = ''
diff --git a/nixos/modules/services/ttys/gpm.nix b/nixpkgs/nixos/modules/services/ttys/gpm.nix
index 308a6d3643a6..308a6d3643a6 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 dc37f9bee4b3..dc37f9bee4b3 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 cf163271d276..cf163271d276 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 020ca8d89dbb..020ca8d89dbb 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 b0019e77ac27..b0019e77ac27 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 7ae7cd9c52d8..7ae7cd9c52d8 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 69a89107d310..69a89107d310 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 37359869cb64..37359869cb64 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/frab.nix b/nixpkgs/nixos/modules/services/web-apps/frab.nix
index e885dc69b3c0..e885dc69b3c0 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/icingaweb2/icingaweb2.nix b/nixpkgs/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix
index 910e1d937bf3..910e1d937bf3 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 167e5e389568..167e5e389568 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/limesurvey.nix b/nixpkgs/nixos/modules/services/web-apps/limesurvey.nix
index 5b2f3875aaa9..5b2f3875aaa9 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 8485492c51c7..8485492c51c7 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 14aca45a342b..14aca45a342b 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 8c7fc4056adc..8c7fc4056adc 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/miniflux.nix b/nixpkgs/nixos/modules/services/web-apps/miniflux.nix
index 304712d0efc3..304712d0efc3 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/nextcloud.nix b/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix
index fa9a36d11892..fa9a36d11892 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 d78d866086a6..d78d866086a6 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 052dbed6d4f8..052dbed6d4f8 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 93f69bd12651..93f69bd12651 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 b200a89260ac..b200a89260ac 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 cd0f743a5fb8..cd0f743a5fb8 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/tt-rss.nix b/nixpkgs/nixos/modules/services/web-apps/tt-rss.nix
index b882f6c2ae7e..b882f6c2ae7e 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 e5c0bff2168a..e5c0bff2168a 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 624b0089a037..624b0089a037 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 691cbdc8d1d5..691cbdc8d1d5 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-servers/apache-httpd/default.nix b/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix
index bf99f6c132af..bf99f6c132af 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/foswiki.nix b/nixpkgs/nixos/modules/services/web-servers/apache-httpd/foswiki.nix
index 8c1ac8935a47..8c1ac8935a47 100644
--- a/nixos/modules/services/web-servers/apache-httpd/foswiki.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/apache-httpd/foswiki.nix
diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixpkgs/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
index 6234478014ce..6234478014ce 100644
--- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/apache-httpd/mediawiki.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 4bbd041b6e04..4bbd041b6e04 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/apache-httpd/tomcat-connector.nix b/nixpkgs/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix
index a883bb2b3433..a883bb2b3433 100644
--- a/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix
diff --git a/nixos/modules/services/web-servers/apache-httpd/trac.nix b/nixpkgs/nixos/modules/services/web-servers/apache-httpd/trac.nix
index 28b411a64b6f..28b411a64b6f 100644
--- a/nixos/modules/services/web-servers/apache-httpd/trac.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/apache-httpd/trac.nix
diff --git a/nixos/modules/services/web-servers/apache-httpd/zabbix.nix b/nixpkgs/nixos/modules/services/web-servers/apache-httpd/zabbix.nix
index cab16593bcbc..cab16593bcbc 100644
--- a/nixos/modules/services/web-servers/apache-httpd/zabbix.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/apache-httpd/zabbix.nix
diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixpkgs/nixos/modules/services/web-servers/caddy.nix
index d0b936cb019f..d0b936cb019f 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/fcgiwrap.nix b/nixpkgs/nixos/modules/services/web-servers/fcgiwrap.nix
index a64a187255a4..a64a187255a4 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 a6c4cbea1225..a6c4cbea1225 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 a4a5a435b2e6..a4a5a435b2e6 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 2eb89a90f67d..2eb89a90f67d 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 d28724281a83..d28724281a83 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 9f25dc34f3f0..9f25dc34f3f0 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 3f262451c2cb..3f262451c2cb 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 7a3df26e47a6..7a3df26e47a6 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 c494d6966a7f..c494d6966a7f 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 5a00070dc941..5a00070dc941 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 f9b1a8b6ccce..f9b1a8b6ccce 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 cd123000f009..cd123000f009 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 2b7fcb314041..2b7fcb314041 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 272fd1480185..272fd1480185 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 aeb9b1dd79ef..aeb9b1dd79ef 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 15b933c984a6..15b933c984a6 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 ffafbc5e92f2..ffafbc5e92f2 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/phpfpm/pool-options.nix b/nixpkgs/nixos/modules/services/web-servers/phpfpm/pool-options.nix
index d9ad7eff71f2..d9ad7eff71f2 100644
--- a/nixos/modules/services/web-servers/phpfpm/pool-options.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/phpfpm/pool-options.nix
diff --git a/nixos/modules/services/web-servers/shellinabox.nix b/nixpkgs/nixos/modules/services/web-servers/shellinabox.nix
index 58a02ac59c35..58a02ac59c35 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 68261c50324d..68261c50324d 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 5bac895d43ac..5bac895d43ac 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/unit/default.nix b/nixpkgs/nixos/modules/services/web-servers/unit/default.nix
index a4a9d370d644..a4a9d370d644 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 3f858d90fa46..3f858d90fa46 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 63f967185c2d..63f967185c2d 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 4cad2a2ff777..4cad2a2ff777 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/colord.nix b/nixpkgs/nixos/modules/services/x11/colord.nix
index cf113ad2af8c..cf113ad2af8c 100644
--- a/nixos/modules/services/x11/colord.nix
+++ b/nixpkgs/nixos/modules/services/x11/colord.nix
diff --git a/nixos/modules/services/x11/compton.nix b/nixpkgs/nixos/modules/services/x11/compton.nix
index d4357324c870..d4357324c870 100644
--- a/nixos/modules/services/x11/compton.nix
+++ b/nixpkgs/nixos/modules/services/x11/compton.nix
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/default.nix
index 2b1e9169e5f6..2b1e9169e5f6 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 527e4b18045b..527e4b18045b 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 ef6820d33260..ef6820d33260 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 65a7b9c628e5..65a7b9c628e5 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 2224bcd5a2a5..2224bcd5a2a5 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 4368adedb34b..4368adedb34b 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 a2d0810f90df..a2d0810f90df 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 1c04104df41e..1c04104df41e 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 af7a376ae029..af7a376ae029 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 41903b33fae9..41903b33fae9 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 dc8bfc7dc172..dc8bfc7dc172 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/xfce.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix
index 6852154378d7..6852154378d7 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 ea441fbbe715..ea441fbbe715 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/auto.nix b/nixpkgs/nixos/modules/services/x11/display-managers/auto.nix
index 1068a344e0cf..1068a344e0cf 100644
--- a/nixos/modules/services/x11/display-managers/auto.nix
+++ b/nixpkgs/nixos/modules/services/x11/display-managers/auto.nix
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixpkgs/nixos/modules/services/x11/display-managers/default.nix
index 0e87e6adbab8..0e87e6adbab8 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 ff4b91923e02..ff4b91923e02 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 de128809ce30..de128809ce30 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 5b280b024233..5b280b024233 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 ba8151a60f20..ba8151a60f20 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 bfba174144a1..bfba174144a1 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 afa0cebbc527..afa0cebbc527 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 d1ed345ac579..d1ed345ac579 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/slim.nix b/nixpkgs/nixos/modules/services/x11/display-managers/slim.nix
index 124660a43f07..124660a43f07 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 570469843586..570469843586 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 c23e479140f0..c23e479140f0 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/fractalart.nix b/nixpkgs/nixos/modules/services/x11/fractalart.nix
index 448248a58794..448248a58794 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 2dc8eabd95a7..2dc8eabd95a7 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/libinput.nix b/nixpkgs/nixos/modules/services/x11/hardware/libinput.nix
index a0a5e2656852..a0a5e2656852 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/multitouch.nix b/nixpkgs/nixos/modules/services/x11/hardware/multitouch.nix
index c03bb3b494fb..c03bb3b494fb 100644
--- a/nixos/modules/services/x11/hardware/multitouch.nix
+++ b/nixpkgs/nixos/modules/services/x11/hardware/multitouch.nix
diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixpkgs/nixos/modules/services/x11/hardware/synaptics.nix
index f032c5938852..f032c5938852 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 a27889c36a70..a27889c36a70 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/redshift.nix b/nixpkgs/nixos/modules/services/x11/redshift.nix
index 4345a3348081..4345a3348081 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 503c14c9b624..503c14c9b624 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 71262431b685..71262431b685 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 5f16a680050d..5f16a680050d 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 d916fa5bb393..d916fa5bb393 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 fdbdf35b0f5a..fdbdf35b0f5a 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 ba88a64c702a..ba88a64c702a 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 089e9f769f0a..089e9f769f0a 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 23cd4f6529a6..23cd4f6529a6 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 176c1f461271..176c1f461271 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/default.nix b/nixpkgs/nixos/modules/services/x11/window-managers/default.nix
index 2a1f22fa9a4c..2a1f22fa9a4c 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 7777913ce1e6..7777913ce1e6 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 6e19e3572c79..6e19e3572c79 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 dc1d957c1709..dc1d957c1709 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 b409335702af..b409335702af 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 9a51b9cd6602..9a51b9cd6602 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 e3ea61cb9a6b..e3ea61cb9a6b 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 0ef55d5f2c03..0ef55d5f2c03 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 f4ae9222df67..f4ae9222df67 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 0e8dab2e9224..0e8dab2e9224 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 3ef40df95df2..3ef40df95df2 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 5175fd7f3b1f..5175fd7f3b1f 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 31f7b725f747..31f7b725f747 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 84cf1d770776..84cf1d770776 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 4ece0d241c90..4ece0d241c90 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 165772d1aa09..165772d1aa09 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 bd7e3396864b..bd7e3396864b 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 850335ce7ddf..850335ce7ddf 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 ad3b65150b01..ad3b65150b01 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 0d58481d4579..0d58481d4579 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 b988b5e1829e..b988b5e1829e 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 a1dc298d2426..a1dc298d2426 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 27a17178476a..27a17178476a 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 fc09901aae3b..fc09901aae3b 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 fb891a39fa41..fb891a39fa41 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 b62723758056..b62723758056 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 9b50a99bf23f..9b50a99bf23f 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 a6055f26789e..a6055f26789e 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 cbe000058dc6..cbe000058dc6 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 b95fac68f165..b95fac68f165 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 13dcf803db29..13dcf803db29 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 ea7cfa1aa43c..ea7cfa1aa43c 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 a1ed2fd1e97b..a1ed2fd1e97b 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 74c150a848d1..74c150a848d1 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 7f4584435266..7f4584435266 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 8ff00fa11dc7..8ff00fa11dc7 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 5c88d27b6c65..5c88d27b6c65 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 d6c0f0504868..d6c0f0504868 100644
--- a/nixos/modules/system/boot/binfmt.nix
+++ b/nixpkgs/nixos/modules/system/boot/binfmt.nix
diff --git a/nixos/modules/system/boot/coredump.nix b/nixpkgs/nixos/modules/system/boot/coredump.nix
index 30f367da7666..30f367da7666 100644
--- a/nixos/modules/system/boot/coredump.nix
+++ b/nixpkgs/nixos/modules/system/boot/coredump.nix
diff --git a/nixos/modules/system/boot/emergency-mode.nix b/nixpkgs/nixos/modules/system/boot/emergency-mode.nix
index 9cdab8416192..9cdab8416192 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 8c9b1502558a..8c9b1502558a 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 cb8fc957a990..cb8fc957a990 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 2d3e3b05c980..2d3e3b05c980 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 ee43fe100238..ee43fe100238 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 a316782dfc57..a316782dfc57 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 fd2cb94b756b..fd2cb94b756b 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 6043c904c450..6043c904c450 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 e723b9eb7cb3..e723b9eb7cb3 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 2d27611946e2..2d27611946e2 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 af39c7bb6841..af39c7bb6841 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 576a07c1d272..576a07c1d272 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 c780a89b102c..c780a89b102c 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 4e4d14985b0d..4e4d14985b0d 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 a36b3c180eb4..a36b3c180eb4 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 249c2761934d..249c2761934d 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 94e5a14174b0..94e5a14174b0 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 08d4ab14c9ca..08d4ab14c9ca 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 374d9524ff1e..374d9524ff1e 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 7fbda9ef0f57..7fbda9ef0f57 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 7eb52e3d021f..7eb52e3d021f 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 0fb07de10c04..0fb07de10c04 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 7db60daa60b8..7db60daa60b8 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 9d4f8a93d282..9d4f8a93d282 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 ea591427179f..ea591427179f 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 f48a085ce57a..f48a085ce57a 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 910a602c61de..910a602c61de 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 b5c8d5241a3d..b5c8d5241a3d 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 dee0ab470c99..dee0ab470c99 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 f1aa9064bef4..f1aa9064bef4 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 b40c383ac023..b40c383ac023 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 e4223bae7d32..e4223bae7d32 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 5c66cf4a6e6e..5c66cf4a6e6e 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 11041066e07c..11041066e07c 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 67cbe720ddc3..67cbe720ddc3 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 788e3f4a2ab1..788e3f4a2ab1 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 03daafa1ce4f..03daafa1ce4f 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 55e6b19c67fd..55e6b19c67fd 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 28ad4f121bbe..28ad4f121bbe 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 34a34091a7dc..34a34091a7dc 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 63f974b704f3..63f974b704f3 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 cf35504e5182..cf35504e5182 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 8282cdd6f3aa..8282cdd6f3aa 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 5bf5e2eb2ec5..5bf5e2eb2ec5 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 57ade2880962..57ade2880962 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 1ca4c3046f0e..1ca4c3046f0e 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 eed20065087f..eed20065087f 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 91f4ae79ee91..91f4ae79ee91 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 8bab91c721fd..8bab91c721fd 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 513382936e47..513382936e47 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 2c9231f55236..2c9231f55236 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 43764bb82f1f..43764bb82f1f 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 5fda24adb978..5fda24adb978 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 48be18c71021..48be18c71021 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 47ba0c03c563..47ba0c03c563 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 12a407cabbfb..12a407cabbfb 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 1527f993fdd4..1527f993fdd4 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 a14a3ac38549..a14a3ac38549 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 a305235979a2..a305235979a2 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 e8c7fa8efbae..e8c7fa8efbae 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 fc3905c7dc20..fc3905c7dc20 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 d3a558738f4b..d3a558738f4b 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 c40d2a1a80bc..c40d2a1a80bc 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 ab4c43e2ab82..ab4c43e2ab82 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 1dcc4c87e3ce..1dcc4c87e3ce 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 5497194f6a8d..5497194f6a8d 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 958e27ae8a32..958e27ae8a32 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 c6a90bcf1a51..c6a90bcf1a51 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 f7f07bad9522..f7f07bad9522 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix
diff --git a/nixos/modules/tasks/kbd.nix b/nixpkgs/nixos/modules/tasks/kbd.nix
index 6d34f897d189..6d34f897d189 100644
--- a/nixos/modules/tasks/kbd.nix
+++ b/nixpkgs/nixos/modules/tasks/kbd.nix
diff --git a/nixos/modules/tasks/lvm.nix b/nixpkgs/nixos/modules/tasks/lvm.nix
index d56a8a2f63a8..d56a8a2f63a8 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 c12ada7a030a..c12ada7a030a 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 857aaf1e6e30..857aaf1e6e30 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 f9b0eb330bf8..f9b0eb330bf8 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 609831506e16..609831506e16 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 a9d987780ee1..a9d987780ee1 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 93e03c44c868..93e03c44c868 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 b154cf9f5f08..b154cf9f5f08 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 55c3a1ebfa8a..55c3a1ebfa8a 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 7c2b9c05cf9a..7c2b9c05cf9a 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 17d5e3376908..17d5e3376908 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 1a11d9ce7c26..1a11d9ce7c26 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 d67790702f1f..d67790702f1f 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 8032b2c6d7ca..8032b2c6d7ca 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 15de8638bbab..15de8638bbab 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 c63b971ead02..c63b971ead02 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 2a7ad08a4afc..2a7ad08a4afc 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 770cefbcd511..770cefbcd511 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 281be9a12318..281be9a12318 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 03239991b95a..03239991b95a 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 267ba50ae025..267ba50ae025 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 780bd1b78dce..780bd1b78dce 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 dd2108ccc379..dd2108ccc379 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 22c82fc14f65..22c82fc14f65 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 0a018e4cd695..0a018e4cd695 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 e716982c510a..e716982c510a 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 78afebdc5dd3..78afebdc5dd3 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 604fb8a75932..604fb8a75932 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 c10e2b162ccc..c10e2b162ccc 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixpkgs/nixos/modules/virtualisation/containers.nix
diff --git a/nixos/modules/virtualisation/docker-containers.nix b/nixpkgs/nixos/modules/virtualisation/docker-containers.nix
index 59b0943f591f..59b0943f591f 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 baac3a35a78e..baac3a35a78e 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 6ab83058dee1..6ab83058dee1 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 7d196a46276a..7d196a46276a 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 f640bb21b133..f640bb21b133 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 db3dd9949c12..db3dd9949c12 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 b531787c31a2..b531787c31a2 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 fc51b159579e..fc51b159579e 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 5354d91deb93..5354d91deb93 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 5c59188b68b2..5c59188b68b2 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 d172ae38fdcf..d172ae38fdcf 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 444c0bc1630e..444c0bc1630e 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 0f1f052880c5..0f1f052880c5 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 289e26e17035..289e26e17035 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 394b4ce56563..394b4ce56563 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 d49364840187..d49364840187 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 9b5adaf08249..9b5adaf08249 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 b2457403463a..b2457403463a 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 505c11abd208..505c11abd208 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 c2da5d0d2301..c2da5d0d2301 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 edec37402308..edec37402308 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 4e0f2cae299e..4e0f2cae299e 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 665224e35d8c..665224e35d8c 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 ed3431554be4..ed3431554be4 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix
diff --git a/nixos/modules/virtualisation/rkt.nix b/nixpkgs/nixos/modules/virtualisation/rkt.nix
index fd662b52df52..fd662b52df52 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 834b994e92d2..834b994e92d2 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 41bcb909fb5c..41bcb909fb5c 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 ab65523592d7..ab65523592d7 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 d18778f81588..d18778f81588 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 675cf9297371..675cf9297371 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 70e575b6c0d2..70e575b6c0d2 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 c00b984c2ce0..c00b984c2ce0 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 b9a9515f94ef..b9a9515f94ef 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 84af457801a1..84af457801a1 100644
--- a/nixos/release-small.nix
+++ b/nixpkgs/nixos/release-small.nix
diff --git a/nixos/release.nix b/nixpkgs/nixos/release.nix
index df2c52ccd0b6..df2c52ccd0b6 100644
--- a/nixos/release.nix
+++ b/nixpkgs/nixos/release.nix
diff --git a/nixos/tests/acme.nix b/nixpkgs/nixos/tests/acme.nix
index 4669a092433e..4669a092433e 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 665a75e47dad..665a75e47dad 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 fedfde233e8d..fedfde233e8d 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 25db72799241..25db72799241 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 ada104a34de3..ada104a34de3 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 ae4f54d5266a..ae4f54d5266a 100644
--- a/nixos/tests/avahi.nix
+++ b/nixpkgs/nixos/tests/avahi.nix
diff --git a/nixos/tests/bcachefs.nix b/nixpkgs/nixos/tests/bcachefs.nix
index 658676ef0ab9..658676ef0ab9 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 fa2fbc2c92ab..fa2fbc2c92ab 100644
--- a/nixos/tests/beanstalkd.nix
+++ b/nixpkgs/nixos/tests/beanstalkd.nix
diff --git a/nixos/tests/beegfs.nix b/nixpkgs/nixos/tests/beegfs.nix
index 9c241fd2301a..9c241fd2301a 100644
--- a/nixos/tests/beegfs.nix
+++ b/nixpkgs/nixos/tests/beegfs.nix
diff --git a/nixos/tests/bees.nix b/nixpkgs/nixos/tests/bees.nix
index 6f68c2f834f1..6f68c2f834f1 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 1f8c1dc7be40..1f8c1dc7be40 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 3b1169a1b7f2..3b1169a1b7f2 100644
--- a/nixos/tests/bittorrent.nix
+++ b/nixpkgs/nixos/tests/bittorrent.nix
diff --git a/nixos/tests/blivet.nix b/nixpkgs/nixos/tests/blivet.nix
index 2adc2ee1eeea..2adc2ee1eeea 100644
--- a/nixos/tests/blivet.nix
+++ b/nixpkgs/nixos/tests/blivet.nix
diff --git a/nixos/tests/boot-stage1.nix b/nixpkgs/nixos/tests/boot-stage1.nix
index b2e74bff6fcd..b2e74bff6fcd 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 c9bb1e77c6d0..c9bb1e77c6d0 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 fdb87dbea438..fdb87dbea438 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 f5c8c4863b6f..f5c8c4863b6f 100644
--- a/nixos/tests/buildbot.nix
+++ b/nixpkgs/nixos/tests/buildbot.nix
diff --git a/nixos/tests/cadvisor.nix b/nixpkgs/nixos/tests/cadvisor.nix
index e60bae4b7003..e60bae4b7003 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 aea4fa4d1c95..aea4fa4d1c95 100644
--- a/nixos/tests/cassandra.nix
+++ b/nixpkgs/nixos/tests/cassandra.nix
diff --git a/nixos/tests/ceph.nix b/nixpkgs/nixos/tests/ceph.nix
index 7408029c460e..7408029c460e 100644
--- a/nixos/tests/ceph.nix
+++ b/nixpkgs/nixos/tests/ceph.nix
diff --git a/nixos/tests/certmgr.nix b/nixpkgs/nixos/tests/certmgr.nix
index fe67833808ce..fe67833808ce 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 513ed8c45741..513ed8c45741 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 af5db2a3dbe1..af5db2a3dbe1 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 e03bb9882540..e03bb9882540 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 7d835069ec4d..7d835069ec4d 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 516d29c9036b..516d29c9036b 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 56c624d8cf2f..56c624d8cf2f 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 562f6f24f999..562f6f24f999 100644
--- a/nixos/tests/codimd.nix
+++ b/nixpkgs/nixos/tests/codimd.nix
diff --git a/nixos/tests/colord.nix b/nixpkgs/nixos/tests/colord.nix
index ce38aaca4bf2..ce38aaca4bf2 100644
--- a/nixos/tests/colord.nix
+++ b/nixpkgs/nixos/tests/colord.nix
diff --git a/nixos/tests/common/ec2.nix b/nixpkgs/nixos/tests/common/ec2.nix
index 1e69b63191a7..1e69b63191a7 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 798a749f7f9b..798a749f7f9b 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 8fe59bf4e70c..8fe59bf4e70c 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 3b4a589e4142..3b4a589e4142 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 cc7f8ca650dd..cc7f8ca650dd 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 c3d29ab8f163..c3d29ab8f163 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 6be8d1d18e62..6be8d1d18e62 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 9cd531a1f96c..9cd531a1f96c 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 b8099bf0364a..b8099bf0364a 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 c5a7c165d126..c5a7c165d126 100644
--- a/nixos/tests/common/x11.nix
+++ b/nixpkgs/nixos/tests/common/x11.nix
diff --git a/nixos/tests/containers-bridge.nix b/nixpkgs/nixos/tests/containers-bridge.nix
index 38db64eb7931..38db64eb7931 100644
--- a/nixos/tests/containers-bridge.nix
+++ b/nixpkgs/nixos/tests/containers-bridge.nix
diff --git a/nixos/tests/containers-extra_veth.nix b/nixpkgs/nixos/tests/containers-extra_veth.nix
index b3d3bce87579..b3d3bce87579 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 8cf298c62258..8cf298c62258 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 2e7e4b2f1d69..2e7e4b2f1d69 100644
--- a/nixos/tests/containers-imperative.nix
+++ b/nixpkgs/nixos/tests/containers-imperative.nix
diff --git a/nixos/tests/containers-ipv4.nix b/nixpkgs/nixos/tests/containers-ipv4.nix
index ace68ff2df8b..ace68ff2df8b 100644
--- a/nixos/tests/containers-ipv4.nix
+++ b/nixpkgs/nixos/tests/containers-ipv4.nix
diff --git a/nixos/tests/containers-ipv6.nix b/nixpkgs/nixos/tests/containers-ipv6.nix
index a9499d192bd4..a9499d192bd4 100644
--- a/nixos/tests/containers-ipv6.nix
+++ b/nixpkgs/nixos/tests/containers-ipv6.nix
diff --git a/nixos/tests/containers-macvlans.nix b/nixpkgs/nixos/tests/containers-macvlans.nix
index 2bdb926a8e2b..2bdb926a8e2b 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 1e312f59f437..1e312f59f437 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 ec8e9629c21d..ec8e9629c21d 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 9726ca0cb0e7..9726ca0cb0e7 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 0fb3b591e9f9..0fb3b591e9f9 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 05c21f4907bf..05c21f4907bf 100644
--- a/nixos/tests/containers-tmpfs.nix
+++ b/nixpkgs/nixos/tests/containers-tmpfs.nix
diff --git a/nixos/tests/couchdb.nix b/nixpkgs/nixos/tests/couchdb.nix
index 48ea48eebbb3..48ea48eebbb3 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 22ad84e7bff1..22ad84e7bff1 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 d11dfeec5d0c..d11dfeec5d0c 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 13bc9d3d9168..13bc9d3d9168 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 972552735202..972552735202 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 b306c149be91..b306c149be91 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 eeedec9a392e..eeedec9a392e 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 8936421072a9..8936421072a9 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 637957bd3e8b..637957bd3e8b 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 9ab1a71f3314..9ab1a71f3314 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 d67b2f8743d8..d67b2f8743d8 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 8b852a4f7795..8b852a4f7795 100644
--- a/nixos/tests/documize.nix
+++ b/nixpkgs/nixos/tests/documize.nix
diff --git a/nixos/tests/dovecot.nix b/nixpkgs/nixos/tests/dovecot.nix
index 156079d1d585..156079d1d585 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 384fce67c227..384fce67c227 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 3f02cecb8662..3f02cecb8662 100644
--- a/nixos/tests/ecryptfs.nix
+++ b/nixpkgs/nixos/tests/ecryptfs.nix
diff --git a/nixos/tests/ejabberd.nix b/nixpkgs/nixos/tests/ejabberd.nix
index 0691dfe780d2..0691dfe780d2 100644
--- a/nixos/tests/ejabberd.nix
+++ b/nixpkgs/nixos/tests/ejabberd.nix
diff --git a/nixos/tests/elk.nix b/nixpkgs/nixos/tests/elk.nix
index 95371ef44436..95371ef44436 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 3594e35e343c..3594e35e343c 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 064c498204ae..064c498204ae 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 43fde7d59205..43fde7d59205 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 6c23b31779bc..6c23b31779bc 100644
--- a/nixos/tests/etcd.nix
+++ b/nixpkgs/nixos/tests/etcd.nix
diff --git a/nixos/tests/ferm.nix b/nixpkgs/nixos/tests/ferm.nix
index b8e8663e3ad2..b8e8663e3ad2 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 f5b946a08810..f5b946a08810 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 fcf758910e00..fcf758910e00 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 97c4e8e37ac1..97c4e8e37ac1 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 0b261a684772..0b261a684772 100644
--- a/nixos/tests/flannel.nix
+++ b/nixpkgs/nixos/tests/flannel.nix
diff --git a/nixos/tests/flatpak-builder.nix b/nixpkgs/nixos/tests/flatpak-builder.nix
index 2100631ec7f4..2100631ec7f4 100644
--- a/nixos/tests/flatpak-builder.nix
+++ b/nixpkgs/nixos/tests/flatpak-builder.nix
diff --git a/nixos/tests/flatpak.nix b/nixpkgs/nixos/tests/flatpak.nix
index b0c61830d05a..b0c61830d05a 100644
--- a/nixos/tests/flatpak.nix
+++ b/nixpkgs/nixos/tests/flatpak.nix
diff --git a/nixos/tests/fsck.nix b/nixpkgs/nixos/tests/fsck.nix
index f943bb7f2350..f943bb7f2350 100644
--- a/nixos/tests/fsck.nix
+++ b/nixpkgs/nixos/tests/fsck.nix
diff --git a/nixos/tests/fwupd.nix b/nixpkgs/nixos/tests/fwupd.nix
index 88dac8ccbcdb..88dac8ccbcdb 100644
--- a/nixos/tests/fwupd.nix
+++ b/nixpkgs/nixos/tests/fwupd.nix
diff --git a/nixos/tests/gdk-pixbuf.nix b/nixpkgs/nixos/tests/gdk-pixbuf.nix
index 005c5111da2b..005c5111da2b 100644
--- a/nixos/tests/gdk-pixbuf.nix
+++ b/nixpkgs/nixos/tests/gdk-pixbuf.nix
diff --git a/nixos/tests/gitea.nix b/nixpkgs/nixos/tests/gitea.nix
index b8ab6dabc8c1..b8ab6dabc8c1 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 ac733461932d..ac733461932d 100644
--- a/nixos/tests/gitlab.nix
+++ b/nixpkgs/nixos/tests/gitlab.nix
diff --git a/nixos/tests/gitolite.nix b/nixpkgs/nixos/tests/gitolite.nix
index 690e456ed7c8..690e456ed7c8 100644
--- a/nixos/tests/gitolite.nix
+++ b/nixpkgs/nixos/tests/gitolite.nix
diff --git a/nixos/tests/gjs.nix b/nixpkgs/nixos/tests/gjs.nix
index e6002ef98dd0..e6002ef98dd0 100644
--- a/nixos/tests/gjs.nix
+++ b/nixpkgs/nixos/tests/gjs.nix
diff --git a/nixos/tests/gnome3-gdm.nix b/nixpkgs/nixos/tests/gnome3-gdm.nix
index c2808d87d99d..c2808d87d99d 100644
--- a/nixos/tests/gnome3-gdm.nix
+++ b/nixpkgs/nixos/tests/gnome3-gdm.nix
diff --git a/nixos/tests/gnome3.nix b/nixpkgs/nixos/tests/gnome3.nix
index b58c9e5a0e32..b58c9e5a0e32 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 50470379576b..50470379576b 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 80cf04ed6404..80cf04ed6404 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 3b84bba3f985..3b84bba3f985 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 fdb7141da317..fdb7141da317 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 bfc527cb97d3..bfc527cb97d3 100644
--- a/nixos/tests/google-oslogin/server.py
+++ b/nixpkgs/nixos/tests/google-oslogin/server.py
diff --git a/nixos/tests/grafana.nix b/nixpkgs/nixos/tests/grafana.nix
index 9dc765a879bc..9dc765a879bc 100644
--- a/nixos/tests/grafana.nix
+++ b/nixpkgs/nixos/tests/grafana.nix
diff --git a/nixos/tests/graphene.nix b/nixpkgs/nixos/tests/graphene.nix
index 5591bcc30c07..5591bcc30c07 100644
--- a/nixos/tests/graphene.nix
+++ b/nixpkgs/nixos/tests/graphene.nix
diff --git a/nixos/tests/graphite.nix b/nixpkgs/nixos/tests/graphite.nix
index 27a87bdbb9f2..27a87bdbb9f2 100644
--- a/nixos/tests/graphite.nix
+++ b/nixpkgs/nixos/tests/graphite.nix
diff --git a/nixos/tests/hadoop/hdfs.nix b/nixpkgs/nixos/tests/hadoop/hdfs.nix
index e7d72a56e1e7..e7d72a56e1e7 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 031592301f17..031592301f17 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 6277ebb4933f..6277ebb4933f 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 ae87e1f69a7d..ae87e1f69a7d 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 22a83e9d1eab..22a83e9d1eab 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 1ff329bd98de..1ff329bd98de 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 274aa7becc82..274aa7becc82 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 cb24c4dcffc2..cb24c4dcffc2 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 fde6f3cbd19a..fde6f3cbd19a 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 0478b1c26351..0478b1c26351 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 4f30f01e4032..4f30f01e4032 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 a127875264e9..a127875264e9 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 78343f0e02f0..78343f0e02f0 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 6b53914fd859..6b53914fd859 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 cb8e25332c07..cb8e25332c07 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 39122c9b473a..39122c9b473a 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 f99b367ac9b7..f99b367ac9b7 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 d309f19a0b4a..d309f19a0b4a 100644
--- a/nixos/tests/i3wm.nix
+++ b/nixpkgs/nixos/tests/i3wm.nix
diff --git a/nixos/tests/iftop.nix b/nixpkgs/nixos/tests/iftop.nix
index a4f524ceb27b..a4f524ceb27b 100644
--- a/nixos/tests/iftop.nix
+++ b/nixpkgs/nixos/tests/iftop.nix
diff --git a/nixos/tests/incron.nix b/nixpkgs/nixos/tests/incron.nix
index e39bbb5f096b..e39bbb5f096b 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 61201202204b..61201202204b 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 b2209f297a4f..b2209f297a4f 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 af340535f0a3..af340535f0a3 100644
--- a/nixos/tests/initrd-network-ssh/dropbear.priv
+++ b/nixpkgs/nixos/tests/initrd-network-ssh/dropbear.priv
Binary files differdiff --git a/nixos/tests/initrd-network-ssh/dropbear.pub b/nixpkgs/nixos/tests/initrd-network-ssh/dropbear.pub
index 385c625522aa..385c625522aa 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 0183e12d7a88..0183e12d7a88 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 816d65435fd7..816d65435fd7 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 5b72b8085f27..5b72b8085f27 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 ed9b82e2da77..ed9b82e2da77 100644
--- a/nixos/tests/initrd-network.nix
+++ b/nixpkgs/nixos/tests/initrd-network.nix
diff --git a/nixos/tests/installer.nix b/nixpkgs/nixos/tests/installer.nix
index 07659b60b3b8..07659b60b3b8 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 3cff7e99ff88..3cff7e99ff88 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 14f24c29cfe2..14f24c29cfe2 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 399a0c272327..399a0c272327 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 b60c6eb94f46..b60c6eb94f46 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 a6eec411ff28..a6eec411ff28 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 f526d18befee..f526d18befee 100644
--- a/nixos/tests/kafka.nix
+++ b/nixpkgs/nixos/tests/kafka.nix
diff --git a/nixos/tests/kerberos/default.nix b/nixpkgs/nixos/tests/kerberos/default.nix
index f2f1a438918c..f2f1a438918c 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 a0551b131e91..a0551b131e91 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 6da3a384aa99..6da3a384aa99 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 f30bd2e2e760..f30bd2e2e760 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 28717fa6a844..28717fa6a844 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 276d2de12bb5..276d2de12bb5 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 b13b4131091f..b13b4131091f 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 2b4c1ab7b052..2b4c1ab7b052 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 e46159836ccc..e46159836ccc 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 dd5b2f37202e..dd5b2f37202e 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 7d7926309c95..7d7926309c95 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 f01cf6988eef..f01cf6988eef 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 212023859f6d..212023859f6d 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 a801759bf582..a801759bf582 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 e7db0a58ab61..e7db0a58ab61 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 175d8413045e..175d8413045e 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 967fe506004f..967fe506004f 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 fe859876ed25..fe859876ed25 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 6163fed56b6f..6163fed56b6f 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 58bf82503f8c..58bf82503f8c 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 8a9a7408d292..8a9a7408d292 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 ad66ada106b7..ad66ada106b7 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 9844ad492e88..9844ad492e88 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 9c3058d02f84..9c3058d02f84 100644
--- a/nixos/tests/loki.nix
+++ b/nixpkgs/nixos/tests/loki.nix
diff --git a/nixos/tests/mailcatcher.nix b/nixpkgs/nixos/tests/mailcatcher.nix
index d45b5d4edfc5..d45b5d4edfc5 100644
--- a/nixos/tests/mailcatcher.nix
+++ b/nixpkgs/nixos/tests/mailcatcher.nix
diff --git a/nixos/tests/make-test.nix b/nixpkgs/nixos/tests/make-test.nix
index cee5da93454a..cee5da93454a 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 fcbeeb18a727..fcbeeb18a727 100644
--- a/nixos/tests/mathics.nix
+++ b/nixpkgs/nixos/tests/mathics.nix
diff --git a/nixos/tests/matrix-synapse.nix b/nixpkgs/nixos/tests/matrix-synapse.nix
index 882e4b75814b..882e4b75814b 100644
--- a/nixos/tests/matrix-synapse.nix
+++ b/nixpkgs/nixos/tests/matrix-synapse.nix
diff --git a/nixos/tests/memcached.nix b/nixpkgs/nixos/tests/memcached.nix
index b120599c51dd..b120599c51dd 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 2e6dc0eda063..2e6dc0eda063 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 be8bb32e49a7..be8bb32e49a7 100644
--- a/nixos/tests/mesos_test.py
+++ b/nixpkgs/nixos/tests/mesos_test.py
diff --git a/nixos/tests/miniflux.nix b/nixpkgs/nixos/tests/miniflux.nix
index 19ab4803a1d3..19ab4803a1d3 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 f1218b537711..f1218b537711 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 ca28bc31cf1c..ca28bc31cf1c 100644
--- a/nixos/tests/misc.nix
+++ b/nixpkgs/nixos/tests/misc.nix
diff --git a/nixos/tests/mongodb.nix b/nixpkgs/nixos/tests/mongodb.nix
index 0ccbeb062f92..0ccbeb062f92 100644
--- a/nixos/tests/mongodb.nix
+++ b/nixpkgs/nixos/tests/mongodb.nix
diff --git a/nixos/tests/morty.nix b/nixpkgs/nixos/tests/morty.nix
index eab123bd50f8..eab123bd50f8 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 86b7f9c044d8..86b7f9c044d8 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 ac2b810defe3..ac2b810defe3 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 c48e3c45b72e..c48e3c45b72e 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 dadd16fd9a0c..dadd16fd9a0c 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 31374aaf77e7..31374aaf77e7 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 e590703ab2f4..e590703ab2f4 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 3d03a5a53e38..3d03a5a53e38 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 81482dfef7e5..81482dfef7e5 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 c75a862106f6..c75a862106f6 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 abf9606aa366..abf9606aa366 100644
--- a/nixos/tests/mysql.nix
+++ b/nixpkgs/nixos/tests/mysql.nix
diff --git a/nixos/tests/nat.nix b/nixpkgs/nixos/tests/nat.nix
index 51d9cf166bb6..51d9cf166bb6 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 c53ff93a91f9..c53ff93a91f9 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 86ed8970517c..86ed8970517c 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 1306d6f8e0c5..1306d6f8e0c5 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 9bd147968e4b..9bd147968e4b 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 ab908c96e5ee..ab908c96e5ee 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 ed9f287d5582..ed9f287d5582 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 bfb97ec3f230..bfb97ec3f230 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 e4c7a70606cf..e4c7a70606cf 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 c0d347238b47..c0d347238b47 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 0351d4db69ac..0351d4db69ac 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 783c9f5c019f..783c9f5c019f 100644
--- a/nixos/tests/nexus.nix
+++ b/nixpkgs/nixos/tests/nexus.nix
diff --git a/nixos/tests/nfs.nix b/nixpkgs/nixos/tests/nfs.nix
index 2f655336e757..2f655336e757 100644
--- a/nixos/tests/nfs.nix
+++ b/nixpkgs/nixos/tests/nfs.nix
diff --git a/nixos/tests/nghttpx.nix b/nixpkgs/nixos/tests/nghttpx.nix
index d41fa01aa9a8..d41fa01aa9a8 100644
--- a/nixos/tests/nghttpx.nix
+++ b/nixpkgs/nixos/tests/nghttpx.nix
diff --git a/nixos/tests/nginx-sso.nix b/nixpkgs/nixos/tests/nginx-sso.nix
index e19992cb6bf7..e19992cb6bf7 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 d66d99821c11..d66d99821c11 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 494d55121eb1..494d55121eb1 100644
--- a/nixos/tests/nix-ssh-serve.nix
+++ b/nixpkgs/nixos/tests/nix-ssh-serve.nix
diff --git a/nixos/tests/novacomd.nix b/nixpkgs/nixos/tests/novacomd.nix
index 4eb60c0feb5c..4eb60c0feb5c 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 c3c91e71b5ca..c3c91e71b5ca 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 042ccec98cf6..042ccec98cf6 100644
--- a/nixos/tests/nzbget.nix
+++ b/nixpkgs/nixos/tests/nzbget.nix
diff --git a/nixos/tests/openldap.nix b/nixpkgs/nixos/tests/openldap.nix
index 3ef90e183479..3ef90e183479 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 883ad7604941..883ad7604941 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 8b9e2170f150..8b9e2170f150 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 d0225016ab76..d0225016ab76 100644
--- a/nixos/tests/openstack-image.nix
+++ b/nixpkgs/nixos/tests/openstack-image.nix
diff --git a/nixos/tests/osquery.nix b/nixpkgs/nixos/tests/osquery.nix
index d95871ffafc6..d95871ffafc6 100644
--- a/nixos/tests/osquery.nix
+++ b/nixpkgs/nixos/tests/osquery.nix
diff --git a/nixos/tests/osrm-backend.nix b/nixpkgs/nixos/tests/osrm-backend.nix
index 6e2d098d4adb..6e2d098d4adb 100644
--- a/nixos/tests/osrm-backend.nix
+++ b/nixpkgs/nixos/tests/osrm-backend.nix
diff --git a/nixos/tests/ostree.nix b/nixpkgs/nixos/tests/ostree.nix
index 8b19004874e7..8b19004874e7 100644
--- a/nixos/tests/ostree.nix
+++ b/nixpkgs/nixos/tests/ostree.nix
diff --git a/nixos/tests/overlayfs.nix b/nixpkgs/nixos/tests/overlayfs.nix
index 99bb6b0f5531..99bb6b0f5531 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 e2d68af661f8..e2d68af661f8 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 b9d489950e72..b9d489950e72 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 1052a2f3b916..1052a2f3b916 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 c50f77f86173..c50f77f86173 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 860ad0a6218f..860ad0a6218f 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 01a08995950f..01a08995950f 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 bf6e6093d69c..bf6e6093d69c 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 fae37fedaac7..fae37fedaac7 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 a2d81288c812..a2d81288c812 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 110cbd5c5b40..110cbd5c5b40 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 19bde9babad5..19bde9babad5 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 788c8719c8d2..788c8719c8d2 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 609afe7b2145..609afe7b2145 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 294eb50b5fe5..294eb50b5fe5 100644
--- a/nixos/tests/postgis.nix
+++ b/nixpkgs/nixos/tests/postgis.nix
diff --git a/nixos/tests/postgresql.nix b/nixpkgs/nixos/tests/postgresql.nix
index ae5d6d095ea2..ae5d6d095ea2 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 8addcc784012..8addcc784012 100644
--- a/nixos/tests/powerdns.nix
+++ b/nixpkgs/nixos/tests/powerdns.nix
diff --git a/nixos/tests/predictable-interface-names.nix b/nixpkgs/nixos/tests/predictable-interface-names.nix
index 85047f66f23c..85047f66f23c 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 e8702c1ffbf1..e8702c1ffbf1 100644
--- a/nixos/tests/printing.nix
+++ b/nixpkgs/nixos/tests/printing.nix
diff --git a/nixos/tests/prometheus-2.nix b/nixpkgs/nixos/tests/prometheus-2.nix
index d7035d49ad4d..d7035d49ad4d 100644
--- a/nixos/tests/prometheus-2.nix
+++ b/nixpkgs/nixos/tests/prometheus-2.nix
diff --git a/nixos/tests/prometheus-exporters.nix b/nixpkgs/nixos/tests/prometheus-exporters.nix
index 90c7c9701f60..90c7c9701f60 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 f1b20a33d71e..f1b20a33d71e 100644
--- a/nixos/tests/prometheus.nix
+++ b/nixpkgs/nixos/tests/prometheus.nix
diff --git a/nixos/tests/prosody.nix b/nixpkgs/nixos/tests/prosody.nix
index a39bae7898dc..a39bae7898dc 100644
--- a/nixos/tests/prosody.nix
+++ b/nixpkgs/nixos/tests/prosody.nix
diff --git a/nixos/tests/proxy.nix b/nixpkgs/nixos/tests/proxy.nix
index 1f39e903cddb..1f39e903cddb 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 6aee7ea57f03..6aee7ea57f03 100644
--- a/nixos/tests/quagga.nix
+++ b/nixpkgs/nixos/tests/quagga.nix
diff --git a/nixos/tests/quake3.nix b/nixpkgs/nixos/tests/quake3.nix
index fbb798515e1a..fbb798515e1a 100644
--- a/nixos/tests/quake3.nix
+++ b/nixpkgs/nixos/tests/quake3.nix
diff --git a/nixos/tests/rabbitmq.nix b/nixpkgs/nixos/tests/rabbitmq.nix
index bb5932c36417..bb5932c36417 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 6b9a909e44b5..6b9a909e44b5 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 607964255640..607964255640 100644
--- a/nixos/tests/radicale.nix
+++ b/nixpkgs/nixos/tests/radicale.nix
diff --git a/nixos/tests/redmine.nix b/nixpkgs/nixos/tests/redmine.nix
index cbdb5c8d2954..cbdb5c8d2954 100644
--- a/nixos/tests/redmine.nix
+++ b/nixpkgs/nixos/tests/redmine.nix
diff --git a/nixos/tests/riak.nix b/nixpkgs/nixos/tests/riak.nix
index 68a9b7315b35..68a9b7315b35 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 ed0ebd7dd19d..ed0ebd7dd19d 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 0cc94728f80a..0cc94728f80a 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 492d47da9f56..492d47da9f56 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 f17e61814c5e..f17e61814c5e 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 339a4b9a7404..339a4b9a7404 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 d0b53db8eeb6..d0b53db8eeb6 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 2802e00a5b1a..2802e00a5b1a 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 678bcbeab20a..678bcbeab20a 100644
--- a/nixos/tests/sddm.nix
+++ b/nixpkgs/nixos/tests/sddm.nix
diff --git a/nixos/tests/signal-desktop.nix b/nixpkgs/nixos/tests/signal-desktop.nix
index 605b9c3e1301..605b9c3e1301 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 84c5621d962f..84c5621d962f 100644
--- a/nixos/tests/simple.nix
+++ b/nixpkgs/nixos/tests/simple.nix
diff --git a/nixos/tests/slim.nix b/nixpkgs/nixos/tests/slim.nix
index 42c87dfa039d..42c87dfa039d 100644
--- a/nixos/tests/slim.nix
+++ b/nixpkgs/nixos/tests/slim.nix
diff --git a/nixos/tests/slurm.nix b/nixpkgs/nixos/tests/slurm.nix
index 4c2cd3c3d264..4c2cd3c3d264 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 07d228051127..07d228051127 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 74ec22fd3499..74ec22fd3499 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 2108e851bc59..2108e851bc59 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 3d5c3b19b6ea..3d5c3b19b6ea 100644
--- a/nixos/tests/sonarr.nix
+++ b/nixpkgs/nixos/tests/sonarr.nix
diff --git a/nixos/tests/ssh-keys.nix b/nixpkgs/nixos/tests/ssh-keys.nix
index 07d422196efa..07d422196efa 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 8bbebd423003..8bbebd423003 100644
--- a/nixos/tests/strongswan-swanctl.nix
+++ b/nixpkgs/nixos/tests/strongswan-swanctl.nix
diff --git a/nixos/tests/subversion.nix b/nixpkgs/nixos/tests/subversion.nix
index e7b99b10602a..e7b99b10602a 100644
--- a/nixos/tests/subversion.nix
+++ b/nixpkgs/nixos/tests/subversion.nix
diff --git a/nixos/tests/sudo.nix b/nixpkgs/nixos/tests/sudo.nix
index fc16b99cc19c..fc16b99cc19c 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 0dba3697980f..0dba3697980f 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 811a466ff941..811a466ff941 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 f1ceb4993337..f1ceb4993337 100644
--- a/nixos/tests/syncthing-relay.nix
+++ b/nixpkgs/nixos/tests/syncthing-relay.nix
diff --git a/nixos/tests/systemd-confinement.nix b/nixpkgs/nixos/tests/systemd-confinement.nix
index b7b10fb36aac..b7b10fb36aac 100644
--- a/nixos/tests/systemd-confinement.nix
+++ b/nixpkgs/nixos/tests/systemd-confinement.nix
diff --git a/nixos/tests/systemd-timesyncd.nix b/nixpkgs/nixos/tests/systemd-timesyncd.nix
index d12b8eb2bf7e..d12b8eb2bf7e 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 4d470126abee..4d470126abee 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 ab9b589f8593..ab9b589f8593 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 6776f8d8c37f..6776f8d8c37f 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 3c68c49ae82c..3c68c49ae82c 100644
--- a/nixos/tests/testdb.sql
+++ b/nixpkgs/nixos/tests/testdb.sql
diff --git a/nixos/tests/timezone.nix b/nixpkgs/nixos/tests/timezone.nix
index 2204649a3fc4..2204649a3fc4 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 cb7ee0c5fb5e..cb7ee0c5fb5e 100644
--- a/nixos/tests/tinydns.nix
+++ b/nixpkgs/nixos/tests/tinydns.nix
diff --git a/nixos/tests/tomcat.nix b/nixpkgs/nixos/tests/tomcat.nix
index 8e7b886dd302..8e7b886dd302 100644
--- a/nixos/tests/tomcat.nix
+++ b/nixpkgs/nixos/tests/tomcat.nix
diff --git a/nixos/tests/tor.nix b/nixpkgs/nixos/tests/tor.nix
index 0cb44ddff248..0cb44ddff248 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 8ec11ebda2cf..8ec11ebda2cf 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 f1c238730ebb..f1c238730ebb 100644
--- a/nixos/tests/transmission.nix
+++ b/nixpkgs/nixos/tests/transmission.nix
diff --git a/nixos/tests/udisks2.nix b/nixpkgs/nixos/tests/udisks2.nix
index dcf869908d82..dcf869908d82 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 98344aee3efa..98344aee3efa 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 afc03e74ed7e..afc03e74ed7e 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 caf0cbb2abfe..caf0cbb2abfe 100644
--- a/nixos/tests/vault.nix
+++ b/nixpkgs/nixos/tests/vault.nix
diff --git a/nixos/tests/virtualbox.nix b/nixpkgs/nixos/tests/virtualbox.nix
index 844ce47d743f..844ce47d743f 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 b0797b963235..b0797b963235 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 897feafe3ff2..897feafe3ff2 100644
--- a/nixos/tests/wireguard/generated.nix
+++ b/nixpkgs/nixos/tests/wireguard/generated.nix
diff --git a/nixos/tests/wireguard/snakeoil-keys.nix b/nixpkgs/nixos/tests/wireguard/snakeoil-keys.nix
index 55ad582d4059..55ad582d4059 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 774ef6293b51..774ef6293b51 100644
--- a/nixos/tests/wordpress.nix
+++ b/nixpkgs/nixos/tests/wordpress.nix
diff --git a/nixos/tests/xautolock.nix b/nixpkgs/nixos/tests/xautolock.nix
index ee46d9e05b06..ee46d9e05b06 100644
--- a/nixos/tests/xautolock.nix
+++ b/nixpkgs/nixos/tests/xautolock.nix
diff --git a/nixos/tests/xdg-desktop-portal.nix b/nixpkgs/nixos/tests/xdg-desktop-portal.nix
index 79ebb83c49a5..79ebb83c49a5 100644
--- a/nixos/tests/xdg-desktop-portal.nix
+++ b/nixpkgs/nixos/tests/xdg-desktop-portal.nix
diff --git a/nixos/tests/xfce.nix b/nixpkgs/nixos/tests/xfce.nix
index 12d8a050d47b..12d8a050d47b 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 4d3bc28cd349..4d3bc28cd349 100644
--- a/nixos/tests/xmonad.nix
+++ b/nixpkgs/nixos/tests/xmonad.nix
diff --git a/nixos/tests/xmpp-sendmessage.nix b/nixpkgs/nixos/tests/xmpp-sendmessage.nix
index 2a075a018134..2a075a018134 100644
--- a/nixos/tests/xmpp-sendmessage.nix
+++ b/nixpkgs/nixos/tests/xmpp-sendmessage.nix
diff --git a/nixos/tests/xrdp.nix b/nixpkgs/nixos/tests/xrdp.nix
index 0106aefe8318..0106aefe8318 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 0d757e8cef3f..0d757e8cef3f 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 bbc0cf4c7dd7..bbc0cf4c7dd7 100644
--- a/nixos/tests/yabar.nix
+++ b/nixpkgs/nixos/tests/yabar.nix
diff --git a/nixos/tests/zfs.nix b/nixpkgs/nixos/tests/zfs.nix
index d7a08268e984..d7a08268e984 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 f343ebd39e44..f343ebd39e44 100644
--- a/nixos/tests/zookeeper.nix
+++ b/nixpkgs/nixos/tests/zookeeper.nix
diff --git a/pkgs/applications/accessibility/mousetweaks/default.nix b/nixpkgs/pkgs/applications/accessibility/mousetweaks/default.nix
index e4fd66679a79..e4fd66679a79 100644
--- a/pkgs/applications/accessibility/mousetweaks/default.nix
+++ b/nixpkgs/pkgs/applications/accessibility/mousetweaks/default.nix
diff --git a/pkgs/applications/altcoins/aeon/default.nix b/nixpkgs/pkgs/applications/altcoins/aeon/default.nix
index 5a09641c70d1..5a09641c70d1 100644
--- a/pkgs/applications/altcoins/aeon/default.nix
+++ b/nixpkgs/pkgs/applications/altcoins/aeon/default.nix
diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/nixpkgs/pkgs/applications/altcoins/bitcoin-abc.nix
index 479d175020b7..479d175020b7 100644
--- a/pkgs/applications/altcoins/bitcoin-abc.nix
+++ b/nixpkgs/pkgs/applications/altcoins/bitcoin-abc.nix
diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/nixpkgs/pkgs/applications/altcoins/bitcoin-classic.nix
index ad48ea2a6257..ad48ea2a6257 100644
--- a/pkgs/applications/altcoins/bitcoin-classic.nix
+++ b/nixpkgs/pkgs/applications/altcoins/bitcoin-classic.nix
diff --git a/pkgs/applications/altcoins/bitcoin-unlimited-const-comparators.patch b/nixpkgs/pkgs/applications/altcoins/bitcoin-unlimited-const-comparators.patch
index 1b74a48a84aa..1b74a48a84aa 100644
--- a/pkgs/applications/altcoins/bitcoin-unlimited-const-comparators.patch
+++ b/nixpkgs/pkgs/applications/altcoins/bitcoin-unlimited-const-comparators.patch
diff --git a/pkgs/applications/altcoins/bitcoin-unlimited.nix b/nixpkgs/pkgs/applications/altcoins/bitcoin-unlimited.nix
index 13ec55bb589d..13ec55bb589d 100644
--- a/pkgs/applications/altcoins/bitcoin-unlimited.nix
+++ b/nixpkgs/pkgs/applications/altcoins/bitcoin-unlimited.nix
diff --git a/pkgs/applications/altcoins/bitcoin-xt.nix b/nixpkgs/pkgs/applications/altcoins/bitcoin-xt.nix
index 499bc4be4c83..499bc4be4c83 100644
--- a/pkgs/applications/altcoins/bitcoin-xt.nix
+++ b/nixpkgs/pkgs/applications/altcoins/bitcoin-xt.nix
diff --git a/pkgs/applications/altcoins/bitcoin.nix b/nixpkgs/pkgs/applications/altcoins/bitcoin.nix
index d1802f774f28..d1802f774f28 100644
--- a/pkgs/applications/altcoins/bitcoin.nix
+++ b/nixpkgs/pkgs/applications/altcoins/bitcoin.nix
diff --git a/pkgs/applications/altcoins/btc1.nix b/nixpkgs/pkgs/applications/altcoins/btc1.nix
index 3241148aee12..3241148aee12 100644
--- a/pkgs/applications/altcoins/btc1.nix
+++ b/nixpkgs/pkgs/applications/altcoins/btc1.nix
diff --git a/pkgs/applications/altcoins/clightning.nix b/nixpkgs/pkgs/applications/altcoins/clightning.nix
index 481e19c66cdc..481e19c66cdc 100644
--- a/pkgs/applications/altcoins/clightning.nix
+++ b/nixpkgs/pkgs/applications/altcoins/clightning.nix
diff --git a/pkgs/applications/altcoins/cryptop/default.nix b/nixpkgs/pkgs/applications/altcoins/cryptop/default.nix
index 01c47b320de5..01c47b320de5 100644
--- a/pkgs/applications/altcoins/cryptop/default.nix
+++ b/nixpkgs/pkgs/applications/altcoins/cryptop/default.nix
diff --git a/pkgs/applications/altcoins/dashpay.nix b/nixpkgs/pkgs/applications/altcoins/dashpay.nix
index b2f2a457a99d..b2f2a457a99d 100644
--- a/pkgs/applications/altcoins/dashpay.nix
+++ b/nixpkgs/pkgs/applications/altcoins/dashpay.nix
diff --git a/pkgs/applications/altcoins/dcrd.nix b/nixpkgs/pkgs/applications/altcoins/dcrd.nix
index cc3e83befa64..cc3e83befa64 100644
--- a/pkgs/applications/altcoins/dcrd.nix
+++ b/nixpkgs/pkgs/applications/altcoins/dcrd.nix
diff --git a/pkgs/applications/altcoins/dcrwallet.nix b/nixpkgs/pkgs/applications/altcoins/dcrwallet.nix
index 8d966684b23c..8d966684b23c 100644
--- a/pkgs/applications/altcoins/dcrwallet.nix
+++ b/nixpkgs/pkgs/applications/altcoins/dcrwallet.nix
diff --git a/pkgs/applications/altcoins/default.nix b/nixpkgs/pkgs/applications/altcoins/default.nix
index 492a221c3f89..492a221c3f89 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/nixpkgs/pkgs/applications/altcoins/default.nix
diff --git a/pkgs/applications/altcoins/dero.nix b/nixpkgs/pkgs/applications/altcoins/dero.nix
index 8405ea8f842b..8405ea8f842b 100644
--- a/pkgs/applications/altcoins/dero.nix
+++ b/nixpkgs/pkgs/applications/altcoins/dero.nix
diff --git a/pkgs/applications/altcoins/dogecoin.nix b/nixpkgs/pkgs/applications/altcoins/dogecoin.nix
index 0452f4013345..0452f4013345 100644
--- a/pkgs/applications/altcoins/dogecoin.nix
+++ b/nixpkgs/pkgs/applications/altcoins/dogecoin.nix
diff --git a/pkgs/applications/altcoins/ethabi.nix b/nixpkgs/pkgs/applications/altcoins/ethabi.nix
index 21d69f14d7f3..21d69f14d7f3 100644
--- a/pkgs/applications/altcoins/ethabi.nix
+++ b/nixpkgs/pkgs/applications/altcoins/ethabi.nix
diff --git a/pkgs/applications/altcoins/exodus/default.nix b/nixpkgs/pkgs/applications/altcoins/exodus/default.nix
index 421f739a7a87..421f739a7a87 100644
--- a/pkgs/applications/altcoins/exodus/default.nix
+++ b/nixpkgs/pkgs/applications/altcoins/exodus/default.nix
diff --git a/pkgs/applications/altcoins/fix-bitcoin-qt-build.patch b/nixpkgs/pkgs/applications/altcoins/fix-bitcoin-qt-build.patch
index c49bbc432519..c49bbc432519 100644
--- a/pkgs/applications/altcoins/fix-bitcoin-qt-build.patch
+++ b/nixpkgs/pkgs/applications/altcoins/fix-bitcoin-qt-build.patch
diff --git a/pkgs/applications/altcoins/freicoin.nix b/nixpkgs/pkgs/applications/altcoins/freicoin.nix
index 78ce074eafd3..78ce074eafd3 100644
--- a/pkgs/applications/altcoins/freicoin.nix
+++ b/nixpkgs/pkgs/applications/altcoins/freicoin.nix
diff --git a/pkgs/applications/altcoins/go-ethereum-classic/default.nix b/nixpkgs/pkgs/applications/altcoins/go-ethereum-classic/default.nix
index 7461e4c376ab..7461e4c376ab 100644
--- a/pkgs/applications/altcoins/go-ethereum-classic/default.nix
+++ b/nixpkgs/pkgs/applications/altcoins/go-ethereum-classic/default.nix
diff --git a/pkgs/applications/altcoins/go-ethereum-classic/deps.nix b/nixpkgs/pkgs/applications/altcoins/go-ethereum-classic/deps.nix
index 0aa6755ee960..0aa6755ee960 100644
--- a/pkgs/applications/altcoins/go-ethereum-classic/deps.nix
+++ b/nixpkgs/pkgs/applications/altcoins/go-ethereum-classic/deps.nix
diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/nixpkgs/pkgs/applications/altcoins/go-ethereum.nix
index cf0261e01c43..cf0261e01c43 100644
--- a/pkgs/applications/altcoins/go-ethereum.nix
+++ b/nixpkgs/pkgs/applications/altcoins/go-ethereum.nix
diff --git a/pkgs/applications/altcoins/litecoin.nix b/nixpkgs/pkgs/applications/altcoins/litecoin.nix
index 33ac2be18322..33ac2be18322 100644
--- a/pkgs/applications/altcoins/litecoin.nix
+++ b/nixpkgs/pkgs/applications/altcoins/litecoin.nix
diff --git a/pkgs/applications/altcoins/masari.nix b/nixpkgs/pkgs/applications/altcoins/masari.nix
index 02a6d25df516..02a6d25df516 100644
--- a/pkgs/applications/altcoins/masari.nix
+++ b/nixpkgs/pkgs/applications/altcoins/masari.nix
diff --git a/pkgs/applications/altcoins/memorycoin.nix b/nixpkgs/pkgs/applications/altcoins/memorycoin.nix
index 944c82250d47..944c82250d47 100644
--- a/pkgs/applications/altcoins/memorycoin.nix
+++ b/nixpkgs/pkgs/applications/altcoins/memorycoin.nix
diff --git a/pkgs/applications/altcoins/mist.nix b/nixpkgs/pkgs/applications/altcoins/mist.nix
index 2990b44c7f4c..2990b44c7f4c 100644
--- a/pkgs/applications/altcoins/mist.nix
+++ b/nixpkgs/pkgs/applications/altcoins/mist.nix
diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/nixpkgs/pkgs/applications/altcoins/monero-gui/default.nix
index d67ac0a7055c..d67ac0a7055c 100644
--- a/pkgs/applications/altcoins/monero-gui/default.nix
+++ b/nixpkgs/pkgs/applications/altcoins/monero-gui/default.nix
diff --git a/pkgs/applications/altcoins/monero-gui/move-log-file.patch b/nixpkgs/pkgs/applications/altcoins/monero-gui/move-log-file.patch
index 260c6d9d00f2..260c6d9d00f2 100644
--- a/pkgs/applications/altcoins/monero-gui/move-log-file.patch
+++ b/nixpkgs/pkgs/applications/altcoins/monero-gui/move-log-file.patch
diff --git a/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch b/nixpkgs/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch
index ff17ce5da1c0..ff17ce5da1c0 100644
--- a/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch
+++ b/nixpkgs/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch
diff --git a/pkgs/applications/altcoins/monero/default.nix b/nixpkgs/pkgs/applications/altcoins/monero/default.nix
index 9a4aa2e0a28a..9a4aa2e0a28a 100644
--- a/pkgs/applications/altcoins/monero/default.nix
+++ b/nixpkgs/pkgs/applications/altcoins/monero/default.nix
diff --git a/pkgs/applications/altcoins/namecoin.nix b/nixpkgs/pkgs/applications/altcoins/namecoin.nix
index 4b8dc5525dc4..4b8dc5525dc4 100644
--- a/pkgs/applications/altcoins/namecoin.nix
+++ b/nixpkgs/pkgs/applications/altcoins/namecoin.nix
diff --git a/pkgs/applications/altcoins/nano-wallet/CMakeLists.txt.patch b/nixpkgs/pkgs/applications/altcoins/nano-wallet/CMakeLists.txt.patch
index 5bbec1d39bea..5bbec1d39bea 100644
--- a/pkgs/applications/altcoins/nano-wallet/CMakeLists.txt.patch
+++ b/nixpkgs/pkgs/applications/altcoins/nano-wallet/CMakeLists.txt.patch
diff --git a/pkgs/applications/altcoins/nano-wallet/default.nix b/nixpkgs/pkgs/applications/altcoins/nano-wallet/default.nix
index 58ab367c020f..58ab367c020f 100644
--- a/pkgs/applications/altcoins/nano-wallet/default.nix
+++ b/nixpkgs/pkgs/applications/altcoins/nano-wallet/default.nix
diff --git a/pkgs/applications/altcoins/parity-ui/default.nix b/nixpkgs/pkgs/applications/altcoins/parity-ui/default.nix
index c59b2ccb8ac3..c59b2ccb8ac3 100644
--- a/pkgs/applications/altcoins/parity-ui/default.nix
+++ b/nixpkgs/pkgs/applications/altcoins/parity-ui/default.nix
diff --git a/pkgs/applications/altcoins/parity-ui/env.nix b/nixpkgs/pkgs/applications/altcoins/parity-ui/env.nix
index 625a008af917..625a008af917 100644
--- a/pkgs/applications/altcoins/parity-ui/env.nix
+++ b/nixpkgs/pkgs/applications/altcoins/parity-ui/env.nix
diff --git a/pkgs/applications/altcoins/parity/beta.nix b/nixpkgs/pkgs/applications/altcoins/parity/beta.nix
index cce0b1c64883..cce0b1c64883 100644
--- a/pkgs/applications/altcoins/parity/beta.nix
+++ b/nixpkgs/pkgs/applications/altcoins/parity/beta.nix
diff --git a/pkgs/applications/altcoins/parity/default.nix b/nixpkgs/pkgs/applications/altcoins/parity/default.nix
index 57b1faf71f70..57b1faf71f70 100644
--- a/pkgs/applications/altcoins/parity/default.nix
+++ b/nixpkgs/pkgs/applications/altcoins/parity/default.nix
diff --git a/pkgs/applications/altcoins/parity/parity.nix b/nixpkgs/pkgs/applications/altcoins/parity/parity.nix
index 011a44fe1709..011a44fe1709 100644
--- a/pkgs/applications/altcoins/parity/parity.nix
+++ b/nixpkgs/pkgs/applications/altcoins/parity/parity.nix
diff --git a/pkgs/applications/altcoins/particl/particl-core.nix b/nixpkgs/pkgs/applications/altcoins/particl/particl-core.nix
index f5efa0bb52c2..f5efa0bb52c2 100644
--- a/pkgs/applications/altcoins/particl/particl-core.nix
+++ b/nixpkgs/pkgs/applications/altcoins/particl/particl-core.nix
diff --git a/pkgs/applications/altcoins/pivx.nix b/nixpkgs/pkgs/applications/altcoins/pivx.nix
index 995b8deccd95..995b8deccd95 100644
--- a/pkgs/applications/altcoins/pivx.nix
+++ b/nixpkgs/pkgs/applications/altcoins/pivx.nix
diff --git a/pkgs/applications/altcoins/polkadot/default.nix b/nixpkgs/pkgs/applications/altcoins/polkadot/default.nix
index 26c9192ee6fa..26c9192ee6fa 100644
--- a/pkgs/applications/altcoins/polkadot/default.nix
+++ b/nixpkgs/pkgs/applications/altcoins/polkadot/default.nix
diff --git a/pkgs/applications/altcoins/stellar-core-dirty-version.patch b/nixpkgs/pkgs/applications/altcoins/stellar-core-dirty-version.patch
index 57d66ce5919a..57d66ce5919a 100644
--- a/pkgs/applications/altcoins/stellar-core-dirty-version.patch
+++ b/nixpkgs/pkgs/applications/altcoins/stellar-core-dirty-version.patch
diff --git a/pkgs/applications/altcoins/stellar-core.nix b/nixpkgs/pkgs/applications/altcoins/stellar-core.nix
index 4c3f9fe0760b..4c3f9fe0760b 100644
--- a/pkgs/applications/altcoins/stellar-core.nix
+++ b/nixpkgs/pkgs/applications/altcoins/stellar-core.nix
diff --git a/pkgs/applications/altcoins/sumokoin.nix b/nixpkgs/pkgs/applications/altcoins/sumokoin.nix
index 026008b2761a..026008b2761a 100644
--- a/pkgs/applications/altcoins/sumokoin.nix
+++ b/nixpkgs/pkgs/applications/altcoins/sumokoin.nix
diff --git a/pkgs/applications/altcoins/wasabiwallet/default.nix b/nixpkgs/pkgs/applications/altcoins/wasabiwallet/default.nix
index 9eef471adad2..9eef471adad2 100644
--- a/pkgs/applications/altcoins/wasabiwallet/default.nix
+++ b/nixpkgs/pkgs/applications/altcoins/wasabiwallet/default.nix
diff --git a/pkgs/applications/altcoins/wownero.nix b/nixpkgs/pkgs/applications/altcoins/wownero.nix
index 6de12b099340..6de12b099340 100644
--- a/pkgs/applications/altcoins/wownero.nix
+++ b/nixpkgs/pkgs/applications/altcoins/wownero.nix
diff --git a/pkgs/applications/altcoins/zcash/default.nix b/nixpkgs/pkgs/applications/altcoins/zcash/default.nix
index 6a8fba3c2bb7..6a8fba3c2bb7 100644
--- a/pkgs/applications/altcoins/zcash/default.nix
+++ b/nixpkgs/pkgs/applications/altcoins/zcash/default.nix
diff --git a/pkgs/applications/altcoins/zcash/librustzcash/default.nix b/nixpkgs/pkgs/applications/altcoins/zcash/librustzcash/default.nix
index 3aeee7e6972f..3aeee7e6972f 100644
--- a/pkgs/applications/altcoins/zcash/librustzcash/default.nix
+++ b/nixpkgs/pkgs/applications/altcoins/zcash/librustzcash/default.nix
diff --git a/pkgs/applications/audio/AMB-plugins/default.nix b/nixpkgs/pkgs/applications/audio/AMB-plugins/default.nix
index 3ea7b90f84a7..3ea7b90f84a7 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 b9322c37df00..b9322c37df00 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 ed7a8481f693..ed7a8481f693 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 70709ae4ac4c..70709ae4ac4c 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 5892351225d3..5892351225d3 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 b602707b3921..b602707b3921 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 631e0c9cca52..631e0c9cca52 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 7b80b32331bc..7b80b32331bc 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 737e73421c9b..737e73421c9b 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 5c379b57ad6a..5c379b57ad6a 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 855d31aadbb0..855d31aadbb0 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 d6064e80e3ff..d6064e80e3ff 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 30a4e052d77c..30a4e052d77c 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 02d818410df4..02d818410df4 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 91a0a1f140c2..91a0a1f140c2 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 9c42c98ba5e3..9c42c98ba5e3 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 68660b5d054b..68660b5d054b 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 019bde7cc64a..019bde7cc64a 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 b685fda7683d..b685fda7683d 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 7b84cd02a627..7b84cd02a627 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 db5f081c4ed4..db5f081c4ed4 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 75b6d8e27580..75b6d8e27580 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 e3f1b6acf874..e3f1b6acf874 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 07a78260991f..07a78260991f 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 1a6ebd346cca..1a6ebd346cca 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 6827d12b3217..6827d12b3217 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 29cecb169998..29cecb169998 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 9d9f82cf4b4b..9d9f82cf4b4b 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 fbe2c97042f0..fbe2c97042f0 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 125c0f7a7536..125c0f7a7536 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 345750e9e2a9..345750e9e2a9 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/bristol/default.nix b/nixpkgs/pkgs/applications/audio/bristol/default.nix
index e1ed12b9bd2e..e1ed12b9bd2e 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 adda92353647..adda92353647 100644
--- a/pkgs/applications/audio/bs1770gain/default.nix
+++ b/nixpkgs/pkgs/applications/audio/bs1770gain/default.nix
diff --git a/pkgs/applications/audio/cadence/default.nix b/nixpkgs/pkgs/applications/audio/cadence/default.nix
index 87efa6fb6b66..87efa6fb6b66 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 d4e2fba0cf41..d4e2fba0cf41 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 dc805a8caf93..dc805a8caf93 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 1f53809e9059..1f53809e9059 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 6e623a69919d..6e623a69919d 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 04f0f9d30259..04f0f9d30259 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 439175b090a8..439175b090a8 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 382d4a1b6675..382d4a1b6675 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 4e517ee636e8..4e517ee636e8 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 3e9cbe2bd8c2..3e9cbe2bd8c2 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 338e5303dcd0..338e5303dcd0 100644
--- a/pkgs/applications/audio/cdparanoia/utils.patch
+++ b/nixpkgs/pkgs/applications/audio/cdparanoia/utils.patch
diff --git a/pkgs/applications/audio/chuck/clang.patch b/nixpkgs/pkgs/applications/audio/chuck/clang.patch
index 77227ef0fd44..77227ef0fd44 100644
--- a/pkgs/applications/audio/chuck/clang.patch
+++ b/nixpkgs/pkgs/applications/audio/chuck/clang.patch
diff --git a/pkgs/applications/audio/chuck/darwin-limits.patch b/nixpkgs/pkgs/applications/audio/chuck/darwin-limits.patch
index 3387f7255441..3387f7255441 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 6113a776a672..6113a776a672 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 226536a13ba7..226536a13ba7 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 344fc31d70dc..344fc31d70dc 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 1b0dfebe22c2..1b0dfebe22c2 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 4da2228c6c13..4da2228c6c13 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 b574993338de..b574993338de 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 84115e1480e1..84115e1480e1 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 e528e9699a73..e528e9699a73 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 f9a53f59e4d4..f9a53f59e4d4 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 f7bf919c2212..f7bf919c2212 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 c3b3b9441357..c3b3b9441357 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 df0fcb0ee9cd..df0fcb0ee9cd 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 e97341acbb44..e97341acbb44 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 4cbab8a128fc..4cbab8a128fc 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 b11f525e9d2b..b11f525e9d2b 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 1dd5f9ee5eb2..1dd5f9ee5eb2 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 d085dc791099..d085dc791099 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 a6ca5b3639da..a6ca5b3639da 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 c37308459bb7..c37308459bb7 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 dab3a97f6e73..dab3a97f6e73 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 d2355681b728..d2355681b728 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 97e054bda64c..97e054bda64c 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 4d5367087c10..4d5367087c10 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 cd45ef5926b0..cd45ef5926b0 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 6c1536c0a610..6c1536c0a610 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 d16534b03d32..d16534b03d32 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 6d56f53bd16f..6d56f53bd16f 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 1c41451b08f3..1c41451b08f3 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 ea0ce8cb5f30..ea0ce8cb5f30 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 494f512752bb..494f512752bb 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 53949da43e0d..53949da43e0d 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 22613da7cabb..22613da7cabb 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 c6fb7c67d584..c6fb7c67d584 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 1013b8a560ca..1013b8a560ca 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 4138a07ec067..4138a07ec067 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 d1a81aac4801..d1a81aac4801 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 209ffa05bf28..209ffa05bf28 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 37c95430627f..37c95430627f 100644
--- a/pkgs/applications/audio/elisa/default.nix
+++ b/nixpkgs/pkgs/applications/audio/elisa/default.nix
diff --git a/pkgs/applications/audio/eq10q/default.nix b/nixpkgs/pkgs/applications/audio/eq10q/default.nix
index 651604c71a11..651604c71a11 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 5d0af8cf17ab..5d0af8cf17ab 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 6b5101b50b5a..6b5101b50b5a 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 8d7db50fd323..8d7db50fd323 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 e5c761a11b35..e5c761a11b35 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 1c5dfc21941a..1c5dfc21941a 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 9f8a65d2b0ca..9f8a65d2b0ca 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 1e0cb20bbf76..1e0cb20bbf76 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 58036ecbe509..58036ecbe509 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 28e4879efdc0..28e4879efdc0 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 6e47d921d345..6e47d921d345 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 383d2deb10bb..383d2deb10bb 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 8ac26e488b37..8ac26e488b37 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 17cec46f6c6a..17cec46f6c6a 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 eb5e5831cddd..eb5e5831cddd 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 b2cc6f464575..b2cc6f464575 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 7762ca393690..7762ca393690 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 5a015e5ca31e..5a015e5ca31e 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 67de98cab9a2..67de98cab9a2 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 3472ce5047eb..3472ce5047eb 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 754c48070603..754c48070603 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 fb5390cb46ef..fb5390cb46ef 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 f0863bfc50b0..f0863bfc50b0 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 2d2d88308cc1..2d2d88308cc1 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 404c9cc825e9..404c9cc825e9 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 a61f7dc0a905..a61f7dc0a905 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 58d095080fe5..58d095080fe5 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 680fab4ca643..680fab4ca643 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 28b2cd98e02c..28b2cd98e02c 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 efb832ae625f..efb832ae625f 100644
--- a/pkgs/applications/audio/freewheeling/default.nix
+++ b/nixpkgs/pkgs/applications/audio/freewheeling/default.nix
diff --git a/pkgs/applications/audio/game-music-emu/default.nix b/nixpkgs/pkgs/applications/audio/game-music-emu/default.nix
index a0a79785283c..a0a79785283c 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 9ff9b8dc1145..9ff9b8dc1145 100644
--- a/pkgs/applications/audio/gbsplay/default.nix
+++ b/nixpkgs/pkgs/applications/audio/gbsplay/default.nix
diff --git a/pkgs/applications/audio/gigedit/default.nix b/nixpkgs/pkgs/applications/audio/gigedit/default.nix
index e9ce20f6c80a..e9ce20f6c80a 100644
--- a/pkgs/applications/audio/gigedit/default.nix
+++ b/nixpkgs/pkgs/applications/audio/gigedit/default.nix
diff --git a/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch b/nixpkgs/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch
index eb00fcc87a24..eb00fcc87a24 100644
--- a/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch
+++ b/nixpkgs/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch
diff --git a/pkgs/applications/audio/gjay/default.nix b/nixpkgs/pkgs/applications/audio/gjay/default.nix
index 42285ba4bf86..42285ba4bf86 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 099e4428016e..099e4428016e 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 ad4fdc02ef3e..ad4fdc02ef3e 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 8446855d190c..8446855d190c 100644
--- a/pkgs/applications/audio/gmu/default.nix
+++ b/nixpkgs/pkgs/applications/audio/gmu/default.nix
diff --git a/pkgs/applications/audio/gnaural/default.nix b/nixpkgs/pkgs/applications/audio/gnaural/default.nix
index f5887e870db6..f5887e870db6 100644
--- a/pkgs/applications/audio/gnaural/default.nix
+++ b/nixpkgs/pkgs/applications/audio/gnaural/default.nix
diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix
index 3981bc792769..3981bc792769 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 b4fe78dcbfcd..b4fe78dcbfcd 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 5951572dd246..5951572dd246 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 656018907a5f..656018907a5f 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 8f77518d03e5..8f77518d03e5 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 3a6296baaa64..3a6296baaa64 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 3aea07235d8a..3aea07235d8a 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 e7a23b6f204c..e7a23b6f204c 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 b653ae5ca588..b653ae5ca588 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 0727ab56f7de..0727ab56f7de 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 9df4308131eb..9df4308131eb 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/nixpkgs/pkgs/applications/audio/guitarix/default.nix
diff --git a/pkgs/applications/audio/gxplugins-lv2/default.nix b/nixpkgs/pkgs/applications/audio/gxplugins-lv2/default.nix
index 62f11cbfb740..62f11cbfb740 100644
--- a/pkgs/applications/audio/gxplugins-lv2/default.nix
+++ b/nixpkgs/pkgs/applications/audio/gxplugins-lv2/default.nix
diff --git a/pkgs/applications/audio/helm/default.nix b/nixpkgs/pkgs/applications/audio/helm/default.nix
index fa76a1a26e82..fa76a1a26e82 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 19aac1bd1e95..19aac1bd1e95 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 d68bfbf2ae4e..d68bfbf2ae4e 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 69fc4b419c06..69fc4b419c06 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 c26980e1bb26..c26980e1bb26 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 d2720fcace67..d2720fcace67 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 2b8c041a0740..2b8c041a0740 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 1e249b51fb76..1e249b51fb76 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 84be6b866fae..84be6b866fae 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 33c74f2b0443..33c74f2b0443 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 f11bba34c74c..f11bba34c74c 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 75a8a6a4b1a1..75a8a6a4b1a1 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 26a717dbd6e4..26a717dbd6e4 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 e44dfddd37b7..e44dfddd37b7 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 83644dd5ea51..83644dd5ea51 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 d1a714ded9ca..d1a714ded9ca 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 0f1ed143dddd..0f1ed143dddd 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 3511a08682c3..3511a08682c3 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 18b7bcd1d568..18b7bcd1d568 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 344e6894baf5..344e6894baf5 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 55039e8508bc..55039e8508bc 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 b4406dab70eb..b4406dab70eb 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 5e54609f8bf0..5e54609f8bf0 100644
--- a/pkgs/applications/audio/klick/default.nix
+++ b/nixpkgs/pkgs/applications/audio/klick/default.nix
diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/nixpkgs/pkgs/applications/audio/ladspa-plugins/default.nix
index a60b3db2fb86..a60b3db2fb86 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 296a4f86a848..296a4f86a848 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 01acc0d01f7e..01acc0d01f7e 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 7fb5a01e2c80..7fb5a01e2c80 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 774add431fab..774add431fab 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 c28259214443..c28259214443 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 3135a00334c7..3135a00334c7 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 d2ec92e0654a..d2ec92e0654a 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 a8e33c23dc0d..a8e33c23dc0d 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 f173e41321f0..f173e41321f0 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 59e94e0bdad5..59e94e0bdad5 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 9a406a994ccc..9a406a994ccc 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 d798a2bed535..d798a2bed535 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 81db133ff9ab..81db133ff9ab 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 4dae65438cb5..4dae65438cb5 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 fdba836a6ae2..fdba836a6ae2 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 d3821c51fbc6..d3821c51fbc6 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 f355c540f301..f355c540f301 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 90e4eabeef0b..90e4eabeef0b 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 73dd7b48e9c4..73dd7b48e9c4 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 39065db6edeb..39065db6edeb 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 362451988d38..362451988d38 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 3f809aa78474..3f809aa78474 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 740763889ffd..740763889ffd 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 fece392ab1cc..fece392ab1cc 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 6237628e600c..6237628e600c 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 cb9247fd3d08..cb9247fd3d08 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 26290e5bf888..26290e5bf888 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 f108b80c1019..f108b80c1019 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 d16107e4c292..d16107e4c292 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 a738cd0b82a9..a738cd0b82a9 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 a2368017cc1e..a2368017cc1e 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 db70e59218b3..db70e59218b3 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 58c1690a9bb0..58c1690a9bb0 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 0b2607989aa2..0b2607989aa2 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 3c5660724d39..3c5660724d39 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 293d1b0b6c82..293d1b0b6c82 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 c8a751c235b1..c8a751c235b1 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 4aacfcc89a36..4aacfcc89a36 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 448977e5705b..448977e5705b 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 42fa8b7621a5..42fa8b7621a5 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 6b3abeb1e23c..6b3abeb1e23c 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 dcaffe3eb9b4..dcaffe3eb9b4 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 2d301a8b6a96..2d301a8b6a96 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 9fbcf8b7ac29..9fbcf8b7ac29 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 3ed330cc7437..3ed330cc7437 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 7499f9c539bc..7499f9c539bc 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 37d81dddf2bc..37d81dddf2bc 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 c66f78373228..c66f78373228 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 9684e5bf8e43..9684e5bf8e43 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 1b3e89d4885e..1b3e89d4885e 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 9015a8c749a8..9015a8c749a8 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 8c173140efd8..8c173140efd8 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 4a7047401781..4a7047401781 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 2ffc736572bf..2ffc736572bf 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 6d0cc370ff34..6d0cc370ff34 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 3754bf763b20..3754bf763b20 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 b657f69e26ee..b657f69e26ee 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 b0abefd7a1fd..b0abefd7a1fd 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 8002feb0f901..8002feb0f901 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 4b75af5ed579..4b75af5ed579 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 9a6e1bef994c..9a6e1bef994c 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 b8e22a41cabf..b8e22a41cabf 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 eb5aa7c036cc..eb5aa7c036cc 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 907d4b8be168..907d4b8be168 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 6700f21fc8cc..6700f21fc8cc 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 f2922e7eecf9..f2922e7eecf9 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 7477bea7602c..7477bea7602c 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 220e72b568af..220e72b568af 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 efaef97257e0..efaef97257e0 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 ca4cf84591ce..ca4cf84591ce 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 44f1c681ec1a..44f1c681ec1a 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 3ffc5265f7a0..3ffc5265f7a0 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 3d40e4c39f4d..3d40e4c39f4d 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 b3efa82ead47..b3efa82ead47 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 e14594ae3b2d..e14594ae3b2d 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 9407a1c26882..9407a1c26882 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 53a0c90ce46e..53a0c90ce46e 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 47370d4bc2f7..47370d4bc2f7 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 a35d9c670fe8..a35d9c670fe8 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 d35cefb88416..d35cefb88416 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 8b715a24e3cb..8b715a24e3cb 100644
--- a/pkgs/applications/audio/ncpamixer/default.nix
+++ b/nixpkgs/pkgs/applications/audio/ncpamixer/default.nix
diff --git a/pkgs/applications/audio/non/default.nix b/nixpkgs/pkgs/applications/audio/non/default.nix
index 44dd0d2d4ec3..44dd0d2d4ec3 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 85c902d38396..85c902d38396 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 bb186687c66e..bb186687c66e 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 f8f08369ab93..f8f08369ab93 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 85d0e1fbaf71..85d0e1fbaf71 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 993e3c4fe8c5..993e3c4fe8c5 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 7c6dd8475963..7c6dd8475963 100644
--- a/pkgs/applications/audio/opusfile/include-multistream.patch
+++ b/nixpkgs/pkgs/applications/audio/opusfile/include-multistream.patch
diff --git a/nixpkgs/pkgs/applications/audio/orca-c/default.nix b/nixpkgs/pkgs/applications/audio/orca-c/default.nix
new file mode 100644
index 000000000000..aa9918b8672b
--- /dev/null
+++ b/nixpkgs/pkgs/applications/audio/orca-c/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, lib, fetchFromGitHub, ncurses
+, portmidiSupport ? false, portmidi }:
+
+stdenv.mkDerivation rec {
+  name = "orca-${version}-unstable";
+  version = "2019-02-09";
+
+  src = fetchFromGitHub {
+    owner = "hundredrabbits";
+    repo = "Orca-c";
+    rev = "32ca897ef95687a9787453b3d1fc3c80488bfa81";
+    sha256 = "14fn9hlhb0nxfmslynd4knp3li6b981fbqag2n1m1jya8m5mcrwc";
+  };
+
+  buildInputs = [ ncurses ] ++ lib.optional enablePortmidi portmidi;
+
+  buildPhase = ''
+    runHook preBuild
+    bash tool ${if enablePortmidi then "--portmidi" else ""} build release orca
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preinstall
+    mkdir -p "$out/bin"
+    cp build/release/orca "$out/bin"
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Live programming environment (C port)";
+    homepage = https://100r.co/pages/orca.html;
+    license = licenses.mit;
+    maintainers = with maintainers; [ qyliss ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/applications/audio/padthv1/default.nix b/nixpkgs/pkgs/applications/audio/padthv1/default.nix
index 93aacae47aee..93aacae47aee 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 cc4a781ef66c..cc4a781ef66c 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 322a4e238461..322a4e238461 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 6ad931d4867a..6ad931d4867a 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 c00a79cb98b9..c00a79cb98b9 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 7f3940e0ae9c..7f3940e0ae9c 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 b2c049c9eeeb..b2c049c9eeeb 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 ce2979a5e530..ce2979a5e530 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 ae43bad5b2c2..ae43bad5b2c2 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 faa914e13287..faa914e13287 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 0eb75d77c68c..0eb75d77c68c 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 972a162b73f4..972a162b73f4 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 37d692a3ab5a..37d692a3ab5a 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 f2e54b327fce..f2e54b327fce 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 d56462ccc844..d56462ccc844 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 d86e5aae2cd4..d86e5aae2cd4 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 40e45a76b4bf..40e45a76b4bf 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 53afcdd2306a..53afcdd2306a 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 2b1b28c5a849..2b1b28c5a849 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 8cdd8738e2b3..8cdd8738e2b3 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 1ecb8be09ddf..1ecb8be09ddf 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 f2c798d1e6e7..f2c798d1e6e7 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 16d5eb69cb97..16d5eb69cb97 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 5529998803cf..5529998803cf 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 9f51d3008259..9f51d3008259 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 5cfbb7bf5a48..5cfbb7bf5a48 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 5db5035c8352..5db5035c8352 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 e7aace763a1b..e7aace763a1b 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 3a6cd298557f..3a6cd298557f 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 1ad57efda7a0..1ad57efda7a0 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 d414cb756114..d414cb756114 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 328bd8b0b041..328bd8b0b041 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 f63b828a0a89..f63b828a0a89 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 c94c5dd61f26..c94c5dd61f26 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 3c498fe8af1b..3c498fe8af1b 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 0a4c9bebde7c..0a4c9bebde7c 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 6ade9042b532..6ade9042b532 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 80968e2700b4..80968e2700b4 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 fbb2f498c0b1..fbb2f498c0b1 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 b596e74a2649..b596e74a2649 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 7f5191a02c20..7f5191a02c20 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 03f6bb1b7936..03f6bb1b7936 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 b09aa835c9f2..b09aa835c9f2 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 b146513d7350..b146513d7350 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 b83804e16be9..b83804e16be9 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 453da89953e0..453da89953e0 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 d457f25e3162..d457f25e3162 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 c0186a146bee..c0186a146bee 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 3aee97516560..3aee97516560 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 ec71cfb427c6..ec71cfb427c6 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 8f042bd3a669..8f042bd3a669 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 95a08b59b00e..95a08b59b00e 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 1918fa9e3a99..1918fa9e3a99 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 ddbefd129ffe..ddbefd129ffe 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 6516532df33f..6516532df33f 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 ed180c92debc..ed180c92debc 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 24b342a26a92..24b342a26a92 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 0ff23102e755..0ff23102e755 100644
--- a/pkgs/applications/audio/rkrlv2/default.nix
+++ b/nixpkgs/pkgs/applications/audio/rkrlv2/default.nix
diff --git a/pkgs/applications/audio/rosegarden/default.nix b/nixpkgs/pkgs/applications/audio/rosegarden/default.nix
index 313227f77985..313227f77985 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 9e0a3712c971..9e0a3712c971 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 cf429bf98d4c..cf429bf98d4c 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 fbe90c5377df..fbe90c5377df 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 ab1a6e387383..ab1a6e387383 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 d47ede27ece2..d47ede27ece2 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 dd82b1b0e09f..dd82b1b0e09f 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 1047734a2c18..1047734a2c18 100644
--- a/pkgs/applications/audio/setbfree/default.nix
+++ b/nixpkgs/pkgs/applications/audio/setbfree/default.nix
diff --git a/pkgs/applications/audio/sfxr-qt/default.nix b/nixpkgs/pkgs/applications/audio/sfxr-qt/default.nix
index a98d1431d65e..a98d1431d65e 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 fbd0f3c5def3..fbd0f3c5def3 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 8645251b384d..8645251b384d 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 b857c5b68358..b857c5b68358 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 32cfd0f74940..32cfd0f74940 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 5730dec6b994..5730dec6b994 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 9627e35454ee..9627e35454ee 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/nixpkgs/pkgs/applications/audio/snd/default.nix
diff --git a/pkgs/applications/audio/sonata/default.nix b/nixpkgs/pkgs/applications/audio/sonata/default.nix
index d5985f097e9f..d5985f097e9f 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 ee72b6cdb1a4..ee72b6cdb1a4 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 d5f613b45945..d5f613b45945 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 bf4d96c6fc4e..bf4d96c6fc4e 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 cf0b5db81f62..cf0b5db81f62 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 7f22a03c1bb4..7f22a03c1bb4 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 df5806b50b9e..df5806b50b9e 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 babe4edff9df..babe4edff9df 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 9557770418e8..9557770418e8 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 6614e3702247..6614e3702247 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 2401dc60b09a..2401dc60b09a 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 8af7888f74bb..8af7888f74bb 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 372e507ed0e9..372e507ed0e9 100644
--- a/pkgs/applications/audio/split2flac/default.nix
+++ b/nixpkgs/pkgs/applications/audio/split2flac/default.nix
diff --git a/pkgs/applications/audio/spotify/default.nix b/nixpkgs/pkgs/applications/audio/spotify/default.nix
index 6e926fe11c3d..6e926fe11c3d 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 a8836214f2fc..a8836214f2fc 100755
--- a/pkgs/applications/audio/spotify/update.sh
+++ b/nixpkgs/pkgs/applications/audio/spotify/update.sh
diff --git a/pkgs/applications/audio/spotifywm/default.nix b/nixpkgs/pkgs/applications/audio/spotifywm/default.nix
index 64ae9491535a..64ae9491535a 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 3184f89ced95..3184f89ced95 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 496ce779ffb5..496ce779ffb5 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 addc30d604c6..addc30d604c6 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 19386b477942..19386b477942 100644
--- a/pkgs/applications/audio/ssrc/default.nix
+++ b/nixpkgs/pkgs/applications/audio/ssrc/default.nix
diff --git a/pkgs/applications/audio/streamripper/default.nix b/nixpkgs/pkgs/applications/audio/streamripper/default.nix
index 39d1c266a373..39d1c266a373 100644
--- a/pkgs/applications/audio/streamripper/default.nix
+++ b/nixpkgs/pkgs/applications/audio/streamripper/default.nix
diff --git a/pkgs/applications/audio/sunvox/default.nix b/nixpkgs/pkgs/applications/audio/sunvox/default.nix
index 957ee50ca7ad..957ee50ca7ad 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 5e26b6c1cdb8..5e26b6c1cdb8 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 6fa0eb7f8f2b..6fa0eb7f8f2b 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 837a08fa331d..837a08fa331d 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 a739d72898e2..a739d72898e2 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 257963de256f..257963de256f 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 8c7ed20e7482..8c7ed20e7482 100644
--- a/pkgs/applications/audio/timemachine/default.nix
+++ b/nixpkgs/pkgs/applications/audio/timemachine/default.nix
diff --git a/pkgs/applications/audio/tomahawk/default.nix b/nixpkgs/pkgs/applications/audio/tomahawk/default.nix
index 78bd43383539..78bd43383539 100644
--- a/pkgs/applications/audio/tomahawk/default.nix
+++ b/nixpkgs/pkgs/applications/audio/tomahawk/default.nix
diff --git a/pkgs/applications/audio/transcode/default.nix b/nixpkgs/pkgs/applications/audio/transcode/default.nix
index d7d5b65375e9..d7d5b65375e9 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 29021e870afc..29021e870afc 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 0c432acf4afe..0c432acf4afe 100644
--- a/pkgs/applications/audio/traverso/default.nix
+++ b/nixpkgs/pkgs/applications/audio/traverso/default.nix
diff --git a/pkgs/applications/audio/uade123/default.nix b/nixpkgs/pkgs/applications/audio/uade123/default.nix
index 7db3b7ec2376..7db3b7ec2376 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 15935751c32a..15935751c32a 100644
--- a/pkgs/applications/audio/vcv-rack/default.nix
+++ b/nixpkgs/pkgs/applications/audio/vcv-rack/default.nix
diff --git a/pkgs/applications/audio/vimpc/default.nix b/nixpkgs/pkgs/applications/audio/vimpc/default.nix
index ce561b5db314..ce561b5db314 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 b7b0fba2d548..b7b0fba2d548 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 dde96764fe6c..dde96764fe6c 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 c4333b09f18f..c4333b09f18f 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 f815ac02e6e5..f815ac02e6e5 100644
--- a/pkgs/applications/audio/vorbis-tools/default.nix
+++ b/nixpkgs/pkgs/applications/audio/vorbis-tools/default.nix
diff --git a/pkgs/applications/audio/wavegain/default.nix b/nixpkgs/pkgs/applications/audio/wavegain/default.nix
index 5f56fb7297f4..5f56fb7297f4 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 382a1a8b2e21..382a1a8b2e21 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 14b5384330da..14b5384330da 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 562fdc1be8b6..562fdc1be8b6 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 7e43225eedc1..7e43225eedc1 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 d234f6b6b8cc..d234f6b6b8cc 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 a55b47a6c16b..a55b47a6c16b 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 f575af5ecd31..f575af5ecd31 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 386c6cbf22bd..386c6cbf22bd 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 98e959f55f31..98e959f55f31 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 cc1f0af86065..cc1f0af86065 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 ca6d6240688a..ca6d6240688a 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 b800df016c9a..b800df016c9a 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 63bb966e3887..63bb966e3887 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 210d0f7e989d..210d0f7e989d 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 faa90e684aea..faa90e684aea 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 7bc1c07befa1..7bc1c07befa1 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 a9647b11eeea..a9647b11eeea 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 5d5feaf9b943..5d5feaf9b943 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/crashplan/CrashPlanDesktop.patch b/nixpkgs/pkgs/applications/backup/crashplan/CrashPlanDesktop.patch
index 7fa68ba4a388..7fa68ba4a388 100644
--- a/pkgs/applications/backup/crashplan/CrashPlanDesktop.patch
+++ b/nixpkgs/pkgs/applications/backup/crashplan/CrashPlanDesktop.patch
diff --git a/pkgs/applications/backup/crashplan/CrashPlanEngine.patch b/nixpkgs/pkgs/applications/backup/crashplan/CrashPlanEngine.patch
index de2afe2da684..de2afe2da684 100644
--- a/pkgs/applications/backup/crashplan/CrashPlanEngine.patch
+++ b/nixpkgs/pkgs/applications/backup/crashplan/CrashPlanEngine.patch
diff --git a/pkgs/applications/backup/crashplan/crashplan-small-business.nix b/nixpkgs/pkgs/applications/backup/crashplan/crashplan-small-business.nix
index 2016d21c5926..2016d21c5926 100644
--- a/pkgs/applications/backup/crashplan/crashplan-small-business.nix
+++ b/nixpkgs/pkgs/applications/backup/crashplan/crashplan-small-business.nix
diff --git a/pkgs/applications/backup/crashplan/default.nix b/nixpkgs/pkgs/applications/backup/crashplan/default.nix
index 2c76891b3f9e..2c76891b3f9e 100644
--- a/pkgs/applications/backup/crashplan/default.nix
+++ b/nixpkgs/pkgs/applications/backup/crashplan/default.nix
diff --git a/pkgs/applications/backup/deja-dup/default.nix b/nixpkgs/pkgs/applications/backup/deja-dup/default.nix
index 4f8e520cb9f2..4f8e520cb9f2 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 26126fdc9d56..26126fdc9d56 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 50bf2ba4fbd5..50bf2ba4fbd5 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 3a480f70d4b7..3a480f70d4b7 100644
--- a/pkgs/applications/backup/vdmfec/default.nix
+++ b/nixpkgs/pkgs/applications/backup/vdmfec/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 38270a25c9c9..38270a25c9c9 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-mini-greeter/default.nix b/nixpkgs/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
index 91446f73507e..91446f73507e 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 61d65cb64b6b..61d65cb64b6b 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/gtk-greeter.nix b/nixpkgs/pkgs/applications/display-managers/lightdm/gtk-greeter.nix
index 61db182f7446..61db182f7446 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 e8edcc3f634c..e8edcc3f634c 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 b5d32493003d..b5d32493003d 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 aac09dfe876b..aac09dfe876b 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/display-managers/slim/default.nix b/nixpkgs/pkgs/applications/display-managers/slim/default.nix
index e504c09e43e6..e504c09e43e6 100644
--- a/pkgs/applications/display-managers/slim/default.nix
+++ b/nixpkgs/pkgs/applications/display-managers/slim/default.nix
diff --git a/pkgs/applications/display-managers/slim/no-logfile.patch b/nixpkgs/pkgs/applications/display-managers/slim/no-logfile.patch
index f2f5f1549930..f2f5f1549930 100644
--- a/pkgs/applications/display-managers/slim/no-logfile.patch
+++ b/nixpkgs/pkgs/applications/display-managers/slim/no-logfile.patch
diff --git a/pkgs/applications/display-managers/slim/run-once.patch b/nixpkgs/pkgs/applications/display-managers/slim/run-once.patch
index 78f1454a883e..78f1454a883e 100644
--- a/pkgs/applications/display-managers/slim/run-once.patch
+++ b/nixpkgs/pkgs/applications/display-managers/slim/run-once.patch
diff --git a/pkgs/applications/display-managers/slim/runtime-paths.patch b/nixpkgs/pkgs/applications/display-managers/slim/runtime-paths.patch
index 5a8e07bfbf07..5a8e07bfbf07 100644
--- a/pkgs/applications/display-managers/slim/runtime-paths.patch
+++ b/nixpkgs/pkgs/applications/display-managers/slim/runtime-paths.patch
diff --git a/pkgs/applications/display-managers/slim/sort-sessions.patch b/nixpkgs/pkgs/applications/display-managers/slim/sort-sessions.patch
index cab5610f44fb..cab5610f44fb 100644
--- a/pkgs/applications/display-managers/slim/sort-sessions.patch
+++ b/nixpkgs/pkgs/applications/display-managers/slim/sort-sessions.patch
diff --git a/pkgs/applications/display-managers/slim/themes.nix b/nixpkgs/pkgs/applications/display-managers/slim/themes.nix
index b1be24f3e1d6..b1be24f3e1d6 100644
--- a/pkgs/applications/display-managers/slim/themes.nix
+++ b/nixpkgs/pkgs/applications/display-managers/slim/themes.nix
diff --git a/pkgs/applications/editors/aewan/default.nix b/nixpkgs/pkgs/applications/editors/aewan/default.nix
index 214b435429ae..214b435429ae 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 98692de43170..98692de43170 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 50a752b3eb96..50a752b3eb96 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 28d4d000a378..28d4d000a378 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 7af3742349a6..7af3742349a6 100644
--- a/pkgs/applications/editors/aseprite/default.nix
+++ b/nixpkgs/pkgs/applications/editors/aseprite/default.nix
diff --git a/pkgs/applications/editors/atom/default.nix b/nixpkgs/pkgs/applications/editors/atom/default.nix
index 26deee3b8598..26deee3b8598 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 da78c39324a5..da78c39324a5 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 f78f7fbf9148..f78f7fbf9148 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 9f1db1464482..9f1db1464482 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 ce9f10f39c41..ce9f10f39c41 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 f5e14ff1e096..f5e14ff1e096 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 d08e006ec5b3..d08e006ec5b3 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 72642cfbe63f..72642cfbe63f 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 3b6364a52a1c..3b6364a52a1c 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 4ab11064eae3..4ab11064eae3 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 f4581c4beceb..f4581c4beceb 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 12ca7a071406..12ca7a071406 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 6ae9eb078e26..6ae9eb078e26 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 972a9daded41..972a9daded41 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 cf7980582ff7..cf7980582ff7 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 90a7eeffb047..90a7eeffb047 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 0b6e28434f56..0b6e28434f56 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 17fa75fe6343..17fa75fe6343 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 078b8a03b5d9..078b8a03b5d9 100644
--- a/pkgs/applications/editors/elvis/default.nix
+++ b/nixpkgs/pkgs/applications/editors/elvis/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/auto-complete/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/auto-complete/default.nix
index 40f172316efc..40f172316efc 100644
--- a/pkgs/applications/editors/emacs-modes/auto-complete/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/auto-complete/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/bbdb/3.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/bbdb/3.nix
index d20ab53bf7e1..d20ab53bf7e1 100644
--- a/pkgs/applications/editors/emacs-modes/bbdb/3.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/bbdb/3.nix
diff --git a/pkgs/applications/editors/emacs-modes/bbdb/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/bbdb/default.nix
index 689bcfc9adfd..689bcfc9adfd 100644
--- a/pkgs/applications/editors/emacs-modes/bbdb/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/bbdb/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/bbdb/install-infodir.patch b/nixpkgs/pkgs/applications/editors/emacs-modes/bbdb/install-infodir.patch
index 31ae6b266980..31ae6b266980 100644
--- a/pkgs/applications/editors/emacs-modes/bbdb/install-infodir.patch
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/bbdb/install-infodir.patch
diff --git a/pkgs/applications/editors/emacs-modes/calfw/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/calfw/default.nix
index b8c61bb97af6..b8c61bb97af6 100644
--- a/pkgs/applications/editors/emacs-modes/calfw/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/calfw/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/cask/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/cask/default.nix
index 34120db6aa70..34120db6aa70 100644
--- a/pkgs/applications/editors/emacs-modes/cask/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/cask/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/cedet/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/cedet/default.nix
index e350dc08e71c..e350dc08e71c 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 2d1cbb75981e..2d1cbb75981e 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/coffee/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/coffee/default.nix
index 495b1aca4b53..495b1aca4b53 100644
--- a/pkgs/applications/editors/emacs-modes/coffee/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/coffee/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 6b51f117ad85..6b51f117ad85 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/color-theme/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/color-theme/default.nix
index 407b9e58f0bf..407b9e58f0bf 100644
--- a/pkgs/applications/editors/emacs-modes/color-theme/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/color-theme/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/color-theme/fix-build.patch b/nixpkgs/pkgs/applications/editors/emacs-modes/color-theme/fix-build.patch
index cfc237c8cdc1..cfc237c8cdc1 100644
--- a/pkgs/applications/editors/emacs-modes/color-theme/fix-build.patch
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/color-theme/fix-build.patch
diff --git a/pkgs/applications/editors/emacs-modes/color-theme/gnus-bug.diff b/nixpkgs/pkgs/applications/editors/emacs-modes/color-theme/gnus-bug.diff
index 9d227df562e1..9d227df562e1 100644
--- a/pkgs/applications/editors/emacs-modes/color-theme/gnus-bug.diff
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/color-theme/gnus-bug.diff
diff --git a/pkgs/applications/editors/emacs-modes/cryptol/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/cryptol/default.nix
index 5b408ad7999d..5b408ad7999d 100644
--- a/pkgs/applications/editors/emacs-modes/cryptol/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/cryptol/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/cua/builder.sh b/nixpkgs/pkgs/applications/editors/emacs-modes/cua/builder.sh
index 6f7bb428c1a6..6f7bb428c1a6 100644
--- a/pkgs/applications/editors/emacs-modes/cua/builder.sh
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/cua/builder.sh
diff --git a/pkgs/applications/editors/emacs-modes/cua/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/cua/default.nix
index 0305be28ad62..0305be28ad62 100644
--- a/pkgs/applications/editors/emacs-modes/cua/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/cua/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/d/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/d/default.nix
index 28736acded2f..28736acded2f 100644
--- a/pkgs/applications/editors/emacs-modes/d/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/d/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/darcsum/darcs_context b/nixpkgs/pkgs/applications/editors/emacs-modes/darcsum/darcs_context
index 7e9de1ed80b5..7e9de1ed80b5 100644
--- a/pkgs/applications/editors/emacs-modes/darcsum/darcs_context
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/darcsum/darcs_context
diff --git a/pkgs/applications/editors/emacs-modes/darcsum/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/darcsum/default.nix
index 0a1c2c77b2a2..0a1c2c77b2a2 100644
--- a/pkgs/applications/editors/emacs-modes/darcsum/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/darcsum/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/ecb/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/ecb/default.nix
index 807bb91f850c..807bb91f850c 100644
--- a/pkgs/applications/editors/emacs-modes/ecb/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/ecb/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 7f0a318741fc..7f0a318741fc 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 9c08e91af41e..9c08e91af41e 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/emacs-clang-complete-async/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
index 66ac9a3d77e6..66ac9a3d77e6 100644
--- a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/fix-build.patch b/nixpkgs/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/fix-build.patch
index 89de339a436b..89de339a436b 100644
--- a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/fix-build.patch
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/fix-build.patch
diff --git a/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix
index 8b3a0476e48c..8b3a0476e48c 100644
--- a/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
index 8e1d7092e6a1..8e1d7092e6a1 100644
--- a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/emms/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/emms/default.nix
index f966989b5a30..f966989b5a30 100644
--- a/pkgs/applications/editors/emacs-modes/emms/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/emms/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/ensime/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/ensime/default.nix
index d776103a6627..d776103a6627 100644
--- a/pkgs/applications/editors/emacs-modes/ensime/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/ensime/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/erlang/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/erlang/default.nix
index 463d7fc7e159..463d7fc7e159 100644
--- a/pkgs/applications/editors/emacs-modes/erlang/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/erlang/default.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 077e72f55764..077e72f55764 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/ess/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/ess/default.nix
index ce335a5d4827..ce335a5d4827 100644
--- a/pkgs/applications/editors/emacs-modes/ess/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/ess/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 ad22faf3dff7..ad22faf3dff7 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/flymake-cursor/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix
index eae338d241de..eae338d241de 100644
--- a/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/flymake-cursor/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 fdb28f447192..fdb28f447192 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/gh/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/gh/default.nix
index aa59eace2ae3..aa59eace2ae3 100644
--- a/pkgs/applications/editors/emacs-modes/gh/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/gh/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/gist/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/gist/default.nix
index 08471247f081..08471247f081 100644
--- a/pkgs/applications/editors/emacs-modes/gist/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/gist/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/gn/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/gn/default.nix
index 39e7d1abf386..39e7d1abf386 100644
--- a/pkgs/applications/editors/emacs-modes/gn/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/gn/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix
index a08f138bed95..a08f138bed95 100644
--- a/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/haskell/default.nix
index 6b10766bedb7..6b10766bedb7 100644
--- a/pkgs/applications/editors/emacs-modes/haskell/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/haskell/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/header2/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/header2/default.nix
index 171d8c6b16ae..171d8c6b16ae 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 b28d0ae24a34..b28d0ae24a34 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 8b9ebcd60262..8b9ebcd60262 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 c32669239f88..c32669239f88 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 199a5886e1df..199a5886e1df 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/htmlize/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/htmlize/default.nix
index c16f449c3a24..c16f449c3a24 100644
--- a/pkgs/applications/editors/emacs-modes/htmlize/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/htmlize/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/icicles/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/icicles/default.nix
index 17cf213a799d..17cf213a799d 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 3cc8156337e0..3cc8156337e0 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/idris/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/idris/default.nix
index 2e168b3abf7f..2e168b3abf7f 100644
--- a/pkgs/applications/editors/emacs-modes/idris/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/idris/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/jabber/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/jabber/default.nix
index c0ddbc88cf27..c0ddbc88cf27 100644
--- a/pkgs/applications/editors/emacs-modes/jabber/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/jabber/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/jade/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/jade/default.nix
index 925fa54c735f..925fa54c735f 100644
--- a/pkgs/applications/editors/emacs-modes/jade/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/jade/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/jdee/build-properties.patch b/nixpkgs/pkgs/applications/editors/emacs-modes/jdee/build-properties.patch
index d0a733b912e3..d0a733b912e3 100644
--- a/pkgs/applications/editors/emacs-modes/jdee/build-properties.patch
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/jdee/build-properties.patch
diff --git a/pkgs/applications/editors/emacs-modes/jdee/cedet-paths.patch b/nixpkgs/pkgs/applications/editors/emacs-modes/jdee/cedet-paths.patch
index 8c866e2d1db3..8c866e2d1db3 100644
--- a/pkgs/applications/editors/emacs-modes/jdee/cedet-paths.patch
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/jdee/cedet-paths.patch
diff --git a/pkgs/applications/editors/emacs-modes/jdee/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/jdee/default.nix
index 306fe66823c8..306fe66823c8 100644
--- a/pkgs/applications/editors/emacs-modes/jdee/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/jdee/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/jdee/elib-avltree.patch b/nixpkgs/pkgs/applications/editors/emacs-modes/jdee/elib-avltree.patch
index db891b1655e0..db891b1655e0 100644
--- a/pkgs/applications/editors/emacs-modes/jdee/elib-avltree.patch
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/jdee/elib-avltree.patch
diff --git a/pkgs/applications/editors/emacs-modes/jdee/java-directory.patch b/nixpkgs/pkgs/applications/editors/emacs-modes/jdee/java-directory.patch
index ec03749daa67..ec03749daa67 100644
--- a/pkgs/applications/editors/emacs-modes/jdee/java-directory.patch
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/jdee/java-directory.patch
diff --git a/pkgs/applications/editors/emacs-modes/js2/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/js2/default.nix
index bc94828ec51d..bc94828ec51d 100644
--- a/pkgs/applications/editors/emacs-modes/js2/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/js2/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/let-alist/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/let-alist/default.nix
index f6fee846f920..f6fee846f920 100644
--- a/pkgs/applications/editors/emacs-modes/let-alist/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/let-alist/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 84dae10127e9..84dae10127e9 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/logito/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/logito/default.nix
index c324e395fa9e..c324e395fa9e 100644
--- a/pkgs/applications/editors/emacs-modes/logito/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/logito/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix
index b75c51d3bd74..b75c51d3bd74 100644
--- a/pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/markdown-mode/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/markdown-mode/default.nix
index 7176b289b8b5..7176b289b8b5 100644
--- a/pkgs/applications/editors/emacs-modes/markdown-mode/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/markdown-mode/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/maude/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/maude/default.nix
index 9b737a938a12..9b737a938a12 100644
--- a/pkgs/applications/editors/emacs-modes/maude/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/maude/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 9b2604332454..9b2604332454 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-generated.nix
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index a401bbc0be1b..a401bbc0be1b 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/melpa-stable-generated.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 22ad906fd6eb..22ad906fd6eb 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
index 49486df9a3f4..49486df9a3f4 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
diff --git a/pkgs/applications/editors/emacs-modes/metaweblog/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/metaweblog/default.nix
index a5633cdfabaa..a5633cdfabaa 100644
--- a/pkgs/applications/editors/emacs-modes/metaweblog/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/metaweblog/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/monky/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/monky/default.nix
index 8e35a4e2b571..8e35a4e2b571 100644
--- a/pkgs/applications/editors/emacs-modes/monky/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/monky/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix
index e0057fd30cea..e0057fd30cea 100644
--- a/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/nyan-mode/directory.patch b/nixpkgs/pkgs/applications/editors/emacs-modes/nyan-mode/directory.patch
index b471531ec34c..b471531ec34c 100644
--- a/pkgs/applications/editors/emacs-modes/nyan-mode/directory.patch
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/nyan-mode/directory.patch
diff --git a/pkgs/applications/editors/emacs-modes/ocaml/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/ocaml/default.nix
index 9f8d408dd5a2..9f8d408dd5a2 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/offlineimap/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/offlineimap/default.nix
index e03b1a42ab1a..e03b1a42ab1a 100644
--- a/pkgs/applications/editors/emacs-modes/offlineimap/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/offlineimap/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix
index c1fad2dc8651..c1fad2dc8651 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 1937a94cad11..1937a94cad11 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 46b90a52a091..46b90a52a091 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/org/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/org/default.nix
index a8250ead7b48..a8250ead7b48 100644
--- a/pkgs/applications/editors/emacs-modes/org/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/org/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/org2blog/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/org2blog/default.nix
index 5c1aec7e02b7..5c1aec7e02b7 100644
--- a/pkgs/applications/editors/emacs-modes/org2blog/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/org2blog/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/pcache/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/pcache/default.nix
index f4dcf03dee84..f4dcf03dee84 100644
--- a/pkgs/applications/editors/emacs-modes/pcache/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/pcache/default.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 97d063d452cd..97d063d452cd 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/php/builder.sh b/nixpkgs/pkgs/applications/editors/emacs-modes/php/builder.sh
index 85c448480571..85c448480571 100644
--- a/pkgs/applications/editors/emacs-modes/php/builder.sh
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/php/builder.sh
diff --git a/pkgs/applications/editors/emacs-modes/php/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/php/default.nix
index 2b3cf7b29712..2b3cf7b29712 100644
--- a/pkgs/applications/editors/emacs-modes/php/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/php/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/prolog/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/prolog/default.nix
index b01c526aa8e4..b01c526aa8e4 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/proofgeneral/4.4.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/proofgeneral/4.4.nix
index 0f7ac1d1dc80..0f7ac1d1dc80 100644
--- a/pkgs/applications/editors/emacs-modes/proofgeneral/4.4.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/proofgeneral/4.4.nix
diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
index de72b24f87ac..de72b24f87ac 100644
--- a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch b/nixpkgs/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch
index 704e4b6c8c7a..704e4b6c8c7a 100644
--- a/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch
diff --git a/pkgs/applications/editors/emacs-modes/quack/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/quack/default.nix
index 94cb3104ecc6..94cb3104ecc6 100644
--- a/pkgs/applications/editors/emacs-modes/quack/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/quack/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/railgun/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/railgun/default.nix
index ba716e1dd13b..ba716e1dd13b 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/rainbow-delimiters/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix
index 2b4223cdc1fd..2b4223cdc1fd 100644
--- a/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/rect-mark/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/rect-mark/default.nix
index 1f218439a5ff..1f218439a5ff 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/redshank/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/redshank/default.nix
index e03d2fdc90f6..e03d2fdc90f6 100644
--- a/pkgs/applications/editors/emacs-modes/redshank/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/redshank/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/rudel/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/rudel/default.nix
index 0031ffee4d4d..0031ffee4d4d 100644
--- a/pkgs/applications/editors/emacs-modes/rudel/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/rudel/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/s/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/s/default.nix
index b818348939e8..b818348939e8 100644
--- a/pkgs/applications/editors/emacs-modes/s/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/s/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/sbt-mode/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/sbt-mode/default.nix
index 835cf8081afa..835cf8081afa 100644
--- a/pkgs/applications/editors/emacs-modes/sbt-mode/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/sbt-mode/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix
index 7867226ff806..7867226ff806 100644
--- a/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix
diff --git a/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix
index 0a44deb8ced8..0a44deb8ced8 100644
--- a/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/scala-mode/v2.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 f5aeb35d1840..f5aeb35d1840 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/stgit/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/stgit/default.nix
index b615accd721f..b615accd721f 100644
--- a/pkgs/applications/editors/emacs-modes/stgit/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/stgit/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 aa27e302e5d6..aa27e302e5d6 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/thingatpt-plus/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix
index 820919b5321f..820919b5321f 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 b0cfe9979081..b0cfe9979081 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/tuareg/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/tuareg/default.nix
index be03938f8a53..be03938f8a53 100644
--- a/pkgs/applications/editors/emacs-modes/tuareg/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/tuareg/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/writegood/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/writegood/default.nix
index 6d0631a4cb83..6d0631a4cb83 100644
--- a/pkgs/applications/editors/emacs-modes/writegood/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/writegood/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix
index 661430516b70..661430516b70 100644
--- a/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix
index e147fd53b229..e147fd53b229 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 9403a51df532..9403a51df532 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 852faeb7918b..852faeb7918b 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 2d8099b73736..2d8099b73736 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 88befda899a7..88befda899a7 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 c2756eab961a..c2756eab961a 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 7c21c1cae5e3..7c21c1cae5e3 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 de4708b88908..de4708b88908 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 5d16194fd202..5d16194fd202 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 6d420599152a..6d420599152a 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 104206a14913..104206a14913 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 ce553fa8b288..ce553fa8b288 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 d32a3fb5f1b5..d32a3fb5f1b5 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 0ff56e9145fb..0ff56e9145fb 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 ac35560c7f63..ac35560c7f63 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 a65954d7d2ae..a65954d7d2ae 100644
--- a/pkgs/applications/editors/ghostwriter/default.nix
+++ b/nixpkgs/pkgs/applications/editors/ghostwriter/default.nix
diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix
index 748fbfc42d54..748fbfc42d54 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 cfd3a4289901..cfd3a4289901 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 ec05f0f82622..ec05f0f82622 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 8aea8508aefd..8aea8508aefd 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 c9d94934a444..c9d94934a444 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 dce02b568906..dce02b568906 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 22cc4d47e680..22cc4d47e680 100644
--- a/pkgs/applications/editors/hexcurse/default.nix
+++ b/nixpkgs/pkgs/applications/editors/hexcurse/default.nix
diff --git a/pkgs/applications/editors/hexedit/default.nix b/nixpkgs/pkgs/applications/editors/hexedit/default.nix
index 4671df77554f..4671df77554f 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 e7f200a4c077..e7f200a4c077 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 63864bc581df..63864bc581df 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 a90deaac698d..a90deaac698d 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 2f630f18ab76..2f630f18ab76 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 11322e8240c2..11322e8240c2 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 be20800cde29..be20800cde29 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 b8e3de792c40..b8e3de792c40 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 b4a96228db40..b4a96228db40 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 b2ace8accd8a..b2ace8accd8a 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 9547b82efa1f..9547b82efa1f 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 5e6406e33f28..5e6406e33f28 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 2bca120c1deb..2bca120c1deb 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 4a079625d183..4a079625d183 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 8dfcc4856680..8dfcc4856680 100644
--- a/pkgs/applications/editors/kakoune/default.nix
+++ b/nixpkgs/pkgs/applications/editors/kakoune/default.nix
diff --git a/pkgs/applications/editors/kakoune/plugins.nix b/nixpkgs/pkgs/applications/editors/kakoune/plugins.nix
index d2f3607d63cb..d2f3607d63cb 100644
--- a/pkgs/applications/editors/kakoune/plugins.nix
+++ b/nixpkgs/pkgs/applications/editors/kakoune/plugins.nix
diff --git a/pkgs/applications/editors/kakoune/wrapper.nix b/nixpkgs/pkgs/applications/editors/kakoune/wrapper.nix
index b4cc823880e7..b4cc823880e7 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 48a971a10c6e..48a971a10c6e 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 085affa5f7ec..085affa5f7ec 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 4fbf3ed297c1..4fbf3ed297c1 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 0ed4fe0aaad7..0ed4fe0aaad7 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 23ec887ad621..23ec887ad621 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 86d3de9eb39a..86d3de9eb39a 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 494ad686ee3b..494ad686ee3b 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 b212773712c2..b212773712c2 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 c3b46cf61df8..c3b46cf61df8 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 a2274be463ed..a2274be463ed 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 dfd6543c5985..dfd6543c5985 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 ecbe7e8b7194..ecbe7e8b7194 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 4fb8d51b9692..4fb8d51b9692 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 fab3646efdff..fab3646efdff 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 e2745cbce2d0..e2745cbce2d0 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 a027242c5eef..a027242c5eef 100644
--- a/pkgs/applications/editors/mindforger/default.nix
+++ b/nixpkgs/pkgs/applications/editors/mindforger/default.nix
diff --git a/pkgs/applications/editors/moe/default.nix b/nixpkgs/pkgs/applications/editors/moe/default.nix
index 3f7eba73ca49..3f7eba73ca49 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 c2917aa394f9..c2917aa394f9 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 969aad33ec0b..969aad33ec0b 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 1b1c6eaf9e54..1b1c6eaf9e54 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 6bbdaf77a69b..6bbdaf77a69b 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 fb30036e146f..fb30036e146f 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 9bc6425bc411..9bc6425bc411 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 6fff6df8cdda..6fff6df8cdda 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 0d0877015eee..0d0877015eee 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/nixpkgs/pkgs/applications/editors/neovim/default.nix
diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/nixpkgs/pkgs/applications/editors/neovim/neovim-remote.nix
index 52888c5f85d5..52888c5f85d5 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 3004bf544c42..3004bf544c42 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 eebecf2906fb..eebecf2906fb 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 6a3f581c4e81..6a3f581c4e81 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 28a53cc590f6..28a53cc590f6 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 f634d3ec056a..f634d3ec056a 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 aa1e2a6b5bd7..aa1e2a6b5bd7 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 fa547875a175..fa547875a175 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 ab79c3e780b2..ab79c3e780b2 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 82c89ebdca6e..82c89ebdca6e 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 567f47520352..567f47520352 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 03bdd5e08822..03bdd5e08822 100644
--- a/pkgs/applications/editors/okteta/default.nix
+++ b/nixpkgs/pkgs/applications/editors/okteta/default.nix
diff --git a/pkgs/applications/editors/quilter/default.nix b/nixpkgs/pkgs/applications/editors/quilter/default.nix
index 0252c06b9434..0252c06b9434 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 de9a089ec8c6..de9a089ec8c6 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 a7dc02a9a636..a7dc02a9a636 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 402abdd85636..402abdd85636 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 27c956dcd14e..27c956dcd14e 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 24cb6a246977..24cb6a246977 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 2f4693982a9c..2f4693982a9c 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 871ca1c671dc..871ca1c671dc 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 d20f413700e8..d20f413700e8 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 24639f3bfd46..24639f3bfd46 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 8e52237d949d..8e52237d949d 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 b8fef39d3ea2..b8fef39d3ea2 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 a6d624d4b1ec..a6d624d4b1ec 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 dd986b346a37..dd986b346a37 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 ec2498aa69b9..ec2498aa69b9 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 dfb2e49e0c8d..dfb2e49e0c8d 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 2cb33fbbef30..2cb33fbbef30 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 2c391cae517b..2c391cae517b 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 79ece9d62a98..79ece9d62a98 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 50113dd1566b..50113dd1566b 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 79cad6a9782c..79cad6a9782c 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 80306191ff12..80306191ff12 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 86904c11f748..86904c11f748 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 5f87aad8a871..5f87aad8a871 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 4fa93d78235e..4fa93d78235e 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 aa3b4b99d7a0..aa3b4b99d7a0 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 157204ce1ca3..157204ce1ca3 100644
--- a/pkgs/applications/editors/typora/default.nix
+++ b/nixpkgs/pkgs/applications/editors/typora/default.nix
diff --git a/pkgs/applications/editors/uemacs/default.nix b/nixpkgs/pkgs/applications/editors/uemacs/default.nix
index 551fa67d9863..551fa67d9863 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 8d3a5353c989..8d3a5353c989 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 6bec4fec09ef..6bec4fec09ef 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 2e4d494a0dbb..2e4d494a0dbb 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 5255b04fe5f4..5255b04fe5f4 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 2f34a6ddeb6b..2f34a6ddeb6b 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 274d855731fd..274d855731fd 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 e0ba5145b3e5..e0ba5145b3e5 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 ec2d75ffaf66..ec2d75ffaf66 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 8cb96a9ebbad..8cb96a9ebbad 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 81948918a114..81948918a114 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 7825188fea9b..7825188fea9b 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 e42ca8a0bbf8..e42ca8a0bbf8 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 438292b7683c..438292b7683c 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 fbcc6d0c7374..fbcc6d0c7374 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 074e6b8b12d5..074e6b8b12d5 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 ce67cc2d6484..ce67cc2d6484 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 c345e8a95d55..c345e8a95d55 100644
--- a/pkgs/applications/editors/wxhexeditor/default.nix
+++ b/nixpkgs/pkgs/applications/editors/wxhexeditor/default.nix
diff --git a/pkgs/applications/editors/xmlcopyeditor/default.nix b/nixpkgs/pkgs/applications/editors/xmlcopyeditor/default.nix
index d91403bc54ff..d91403bc54ff 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 253b9ce49ba8..253b9ce49ba8 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 a90275638dc8..a90275638dc8 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 ae3871bb87af..ae3871bb87af 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 b7cf84ff9591..b7cf84ff9591 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 ef09b97b7037..ef09b97b7037 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 a5a0492ab876..a5a0492ab876 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 f272fd04dd0d..f272fd04dd0d 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 6e7fb375eab9..6e7fb375eab9 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 e6af8d130514..e6af8d130514 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 34bb8c9f55ad..34bb8c9f55ad 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 7f60743534bd..7f60743534bd 100644
--- a/pkgs/applications/gis/saga/finite.patch
+++ b/nixpkgs/pkgs/applications/gis/saga/finite.patch
diff --git a/pkgs/applications/gis/saga/lts.nix b/nixpkgs/pkgs/applications/gis/saga/lts.nix
index ca0034aa9708..ca0034aa9708 100644
--- a/pkgs/applications/gis/saga/lts.nix
+++ b/nixpkgs/pkgs/applications/gis/saga/lts.nix
diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/nixpkgs/pkgs/applications/gis/whitebox-tools/default.nix
index d82bdc665498..d82bdc665498 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 f61215f83e22..f61215f83e22 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 ecc6a5b00dec..ecc6a5b00dec 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 938df76e2572..938df76e2572 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 5210af4df7ad..5210af4df7ad 100644
--- a/pkgs/applications/graphics/ahoviewer/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/ahoviewer/default.nix
diff --git a/pkgs/applications/graphics/alchemy/default.nix b/nixpkgs/pkgs/applications/graphics/alchemy/default.nix
index 09664889f35b..09664889f35b 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 c918e4b302bb..c918e4b302bb 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 0257a109568e..0257a109568e 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 9235dd6cdce1..9235dd6cdce1 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 c98c323fc79c..c98c323fc79c 100644
--- a/pkgs/applications/graphics/apitrace/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/apitrace/default.nix
diff --git a/pkgs/applications/graphics/autopanosiftc/default.nix b/nixpkgs/pkgs/applications/graphics/autopanosiftc/default.nix
index c64604975ab0..c64604975ab0 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 31ee0ff0d07b..31ee0ff0d07b 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 cc08dce906c3..cc08dce906c3 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 57631037cd0e..57631037cd0e 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 df742645e86b..df742645e86b 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 b3f8e68dd1ad..b3f8e68dd1ad 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/batik/builder.sh b/nixpkgs/pkgs/applications/graphics/batik/builder.sh
index c6cf64bf3700..c6cf64bf3700 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 51156dea4a17..51156dea4a17 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 7e1c6d7c8c4b..7e1c6d7c8c4b 100644
--- a/pkgs/applications/graphics/c3d/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/c3d/default.nix
diff --git a/pkgs/applications/graphics/cinepaint/default.nix b/nixpkgs/pkgs/applications/graphics/cinepaint/default.nix
index 57cf6c3f13f4..57cf6c3f13f4 100644
--- a/pkgs/applications/graphics/cinepaint/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/cinepaint/default.nix
diff --git a/pkgs/applications/graphics/cinepaint/install.patch b/nixpkgs/pkgs/applications/graphics/cinepaint/install.patch
index f15ff1c4414d..f15ff1c4414d 100644
--- a/pkgs/applications/graphics/cinepaint/install.patch
+++ b/nixpkgs/pkgs/applications/graphics/cinepaint/install.patch
diff --git a/pkgs/applications/graphics/comical/default.nix b/nixpkgs/pkgs/applications/graphics/comical/default.nix
index 2796a5535a03..2796a5535a03 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 db7626074a0f..db7626074a0f 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/darktable/default.nix b/nixpkgs/pkgs/applications/graphics/darktable/default.nix
index e16ef45fe1eb..e16ef45fe1eb 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 71e2d82ea7ca..71e2d82ea7ca 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 0ce160242e56..0ce160242e56 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 cf2376b3733d..cf2376b3733d 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 821a9e8083e1..821a9e8083e1 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 d90fb41c03ba..d90fb41c03ba 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 cf5ecfdd043f..cf5ecfdd043f 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 30101bb94770..30101bb94770 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 70cf1c149ab1..70cf1c149ab1 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 eca3740f9758..eca3740f9758 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 3b7bdfb8efc2..3b7bdfb8efc2 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 562fb8c11dc3..562fb8c11dc3 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 7980d09fed12..7980d09fed12 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 f5560a9b2032..f5560a9b2032 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 6fdc4f741ac4..6fdc4f741ac4 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 1e54152fff4d..1e54152fff4d 100644
--- a/pkgs/applications/graphics/fig2dev/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/fig2dev/default.nix
diff --git a/pkgs/applications/graphics/fondo/default.nix b/nixpkgs/pkgs/applications/graphics/fondo/default.nix
index 920b529d61c3..920b529d61c3 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 8ca093b90c3e..8ca093b90c3e 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 8fc39ded6383..8fc39ded6383 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 0bd3421f1b10..0bd3421f1b10 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 b1437508a509..b1437508a509 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 025b3ae65ece..025b3ae65ece 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 cd06a8315f98..cd06a8315f98 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 5ad7cb88b03a..5ad7cb88b03a 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 08b2757dd6e8..08b2757dd6e8 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 a2a6fe3c14f7..a2a6fe3c14f7 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 1787b1d9e7fc..1787b1d9e7fc 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 b1079ab36604..b1079ab36604 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 0d6a87000ccd..0d6a87000ccd 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 11c1e9ada931..11c1e9ada931 100644
--- a/pkgs/applications/graphics/gimp/wrapper.nix
+++ b/nixpkgs/pkgs/applications/graphics/gimp/wrapper.nix
diff --git a/pkgs/applications/graphics/giv/build.patch b/nixpkgs/pkgs/applications/graphics/giv/build.patch
index f57689fd3fa9..f57689fd3fa9 100644
--- a/pkgs/applications/graphics/giv/build.patch
+++ b/nixpkgs/pkgs/applications/graphics/giv/build.patch
diff --git a/pkgs/applications/graphics/giv/default.nix b/nixpkgs/pkgs/applications/graphics/giv/default.nix
index c5eb126cfbf7..c5eb126cfbf7 100644
--- a/pkgs/applications/graphics/giv/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/giv/default.nix
diff --git a/pkgs/applications/graphics/glabels/default.nix b/nixpkgs/pkgs/applications/graphics/glabels/default.nix
index 6bc59cd7d02b..6bc59cd7d02b 100644
--- a/pkgs/applications/graphics/glabels/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/glabels/default.nix
diff --git a/pkgs/applications/graphics/gnuclad/default.nix b/nixpkgs/pkgs/applications/graphics/gnuclad/default.nix
index b3671ead377a..b3671ead377a 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 f5fa8ca9221d..f5fa8ca9221d 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 2957192f16e5..2957192f16e5 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 9427d45487d4..9427d45487d4 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 86867cd1cca7..86867cd1cca7 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 205376b1257c..205376b1257c 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 b1580d73b641..b1580d73b641 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 91eacecbf8c6..91eacecbf8c6 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 fedcafc59788..fedcafc59788 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 84d1450da823..84d1450da823 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 2cdb1f7e90f7..2cdb1f7e90f7 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 7ecee8d6d631..7ecee8d6d631 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 6bcee18651b0..6bcee18651b0 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 061dc2b69a61..061dc2b69a61 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 d7888da15ef6..d7888da15ef6 100644
--- a/pkgs/applications/graphics/hugin/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/hugin/default.nix
diff --git a/pkgs/applications/graphics/image_optim/Gemfile b/nixpkgs/pkgs/applications/graphics/image_optim/Gemfile
index d6a0f13a4c1a..d6a0f13a4c1a 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 20c9772ce464..20c9772ce464 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 c3dffee3aa8d..c3dffee3aa8d 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 6c9ec2de7457..6c9ec2de7457 100644
--- a/pkgs/applications/graphics/image_optim/gemset.nix
+++ b/nixpkgs/pkgs/applications/graphics/image_optim/gemset.nix
diff --git a/pkgs/applications/graphics/image_optim/update.sh b/nixpkgs/pkgs/applications/graphics/image_optim/update.sh
index 8afd7f90436d..8afd7f90436d 100755
--- a/pkgs/applications/graphics/image_optim/update.sh
+++ b/nixpkgs/pkgs/applications/graphics/image_optim/update.sh
diff --git a/pkgs/applications/graphics/imagej/default.nix b/nixpkgs/pkgs/applications/graphics/imagej/default.nix
index 0bbd543a3076..0bbd543a3076 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 1fa3ec8ccc68..1fa3ec8ccc68 100644
--- a/pkgs/applications/graphics/imgcat/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/imgcat/default.nix
diff --git a/pkgs/applications/graphics/imlibsetroot/default.nix b/nixpkgs/pkgs/applications/graphics/imlibsetroot/default.nix
index a881c0fc1f93..a881c0fc1f93 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 cdbf5f446875..cdbf5f446875 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 1729f3c5cdab..1729f3c5cdab 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 d4a7e396cb05..d4a7e396cb05 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 42ed667dee98..42ed667dee98 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 ed583490c90d..ed583490c90d 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 f438bf6f7ed8..f438bf6f7ed8 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 b24b14698e6a..b24b14698e6a 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 1c65c7da3a28..1c65c7da3a28 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 301dc902dce9..301dc902dce9 100644
--- a/pkgs/applications/graphics/k3d/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/k3d/default.nix
diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/nixpkgs/pkgs/applications/graphics/kgraphviewer/default.nix
index e70fafa24b60..e70fafa24b60 100644
--- a/pkgs/applications/graphics/kgraphviewer/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/kgraphviewer/default.nix
diff --git a/pkgs/applications/graphics/kipi-plugins/default.nix b/nixpkgs/pkgs/applications/graphics/kipi-plugins/default.nix
index de51422d1da6..de51422d1da6 100644
--- a/pkgs/applications/graphics/kipi-plugins/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/kipi-plugins/default.nix
diff --git a/pkgs/applications/graphics/krita/default.nix b/nixpkgs/pkgs/applications/graphics/krita/default.nix
index cc46ac2d3bb4..cc46ac2d3bb4 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 c4c889cdba52..c4c889cdba52 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 c53c70888b2c..c53c70888b2c 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 ada55f0351e1..ada55f0351e1 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 94899c937a86..94899c937a86 100644
--- a/pkgs/applications/graphics/luminance-hdr/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/luminance-hdr/default.nix
diff --git a/pkgs/applications/graphics/mcomix/default.nix b/nixpkgs/pkgs/applications/graphics/mcomix/default.nix
index eea0e501cb8e..eea0e501cb8e 100644
--- a/pkgs/applications/graphics/mcomix/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/mcomix/default.nix
diff --git a/pkgs/applications/graphics/meh/default.nix b/nixpkgs/pkgs/applications/graphics/meh/default.nix
index c25c1277ee0b..c25c1277ee0b 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 2fddc39e0d07..2fddc39e0d07 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 bd5dea8014d6..bd5dea8014d6 100644
--- a/pkgs/applications/graphics/meshlab/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/meshlab/default.nix
diff --git a/pkgs/applications/graphics/meshlab/fix-20180627-beta.patch b/nixpkgs/pkgs/applications/graphics/meshlab/fix-20180627-beta.patch
index 177b8e90c574..177b8e90c574 100644
--- a/pkgs/applications/graphics/meshlab/fix-20180627-beta.patch
+++ b/nixpkgs/pkgs/applications/graphics/meshlab/fix-20180627-beta.patch
diff --git a/pkgs/applications/graphics/minidjvu/default.nix b/nixpkgs/pkgs/applications/graphics/minidjvu/default.nix
index d629c776194d..d629c776194d 100644
--- a/pkgs/applications/graphics/minidjvu/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/minidjvu/default.nix
diff --git a/pkgs/applications/graphics/mirage/default.nix b/nixpkgs/pkgs/applications/graphics/mirage/default.nix
index 515b834b41ea..515b834b41ea 100644
--- a/pkgs/applications/graphics/mirage/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/mirage/default.nix
diff --git a/pkgs/applications/graphics/mozjpeg/default.nix b/nixpkgs/pkgs/applications/graphics/mozjpeg/default.nix
index b48fd891a6ac..b48fd891a6ac 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 8a2a218d9891..8a2a218d9891 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 36c7e7e2fb30..36c7e7e2fb30 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 d0838070262a..d0838070262a 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 53224e0260eb..53224e0260eb 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 80f592681110..80f592681110 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 f2e8eee9940b..f2e8eee9940b 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 00b33b652164..00b33b652164 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 ca3dac34dca5..ca3dac34dca5 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 719aca5096a5..719aca5096a5 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 cf13c6fb05e9..cf13c6fb05e9 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 3cc7166b4e46..3cc7166b4e46 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 2993922a1ecf..2993922a1ecf 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 f13e36ce99e7..f13e36ce99e7 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 de7582710048..de7582710048 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 6bd2fa98b1bb..6bd2fa98b1bb 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 e2eb795fc8e2..e2eb795fc8e2 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 db41ee0566fe..db41ee0566fe 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 68afdd8694b1..68afdd8694b1 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 7da1d4b612f9..7da1d4b612f9 100644
--- a/pkgs/applications/graphics/phototonic/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/phototonic/default.nix
diff --git a/pkgs/applications/graphics/pinta/default.nix b/nixpkgs/pkgs/applications/graphics/pinta/default.nix
index 140903766848..140903766848 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 132136da658b..132136da658b 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 ec4ce69d5e87..ec4ce69d5e87 100644
--- a/pkgs/applications/graphics/pqiv/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/pqiv/default.nix
diff --git a/pkgs/applications/graphics/processing3/default.nix b/nixpkgs/pkgs/applications/graphics/processing3/default.nix
index 6f90131db12a..6f90131db12a 100644
--- a/pkgs/applications/graphics/processing3/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/processing3/default.nix
diff --git a/pkgs/applications/graphics/qcomicbook/default.nix b/nixpkgs/pkgs/applications/graphics/qcomicbook/default.nix
index c37e21ec898a..c37e21ec898a 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 ce08e2b1be92..ce08e2b1be92 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 e6c7ef2408e8..e6c7ef2408e8 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 fafc76a76ffe..fafc76a76ffe 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 0595ab2963ca..0595ab2963ca 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 b300c0071fae..b300c0071fae 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 b244bed9294b..b244bed9294b 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 74e8c0e6b434..74e8c0e6b434 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 3fd4521d7cd8..3fd4521d7cd8 100644
--- a/pkgs/applications/graphics/renderdoc/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix
diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/nixpkgs/pkgs/applications/graphics/sane/backends/brscan4/default.nix
index b431cf51b019..b431cf51b019 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 016162770934..016162770934 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 da136a7f9e1e..da136a7f9e1e 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 20d5629b83a9..20d5629b83a9 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 01c203b407c1..01c203b407c1 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 0f47c82f0325..0f47c82f0325 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 e746f83e5d49..e746f83e5d49 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 c0a0206ddd1f..c0a0206ddd1f 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 f6994db81e4b..f6994db81e4b 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 09b431fdb116..09b431fdb116 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 d55441e39fa5..d55441e39fa5 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 395179ff70ae..395179ff70ae 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 292ae9c8faa8..292ae9c8faa8 100644
--- a/pkgs/applications/graphics/screencloud/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/screencloud/default.nix
diff --git a/pkgs/applications/graphics/seg3d/cstdio.patch b/nixpkgs/pkgs/applications/graphics/seg3d/cstdio.patch
index 0d9eed07a367..0d9eed07a367 100644
--- a/pkgs/applications/graphics/seg3d/cstdio.patch
+++ b/nixpkgs/pkgs/applications/graphics/seg3d/cstdio.patch
diff --git a/pkgs/applications/graphics/seg3d/default.nix b/nixpkgs/pkgs/applications/graphics/seg3d/default.nix
index 58cec2ec1703..58cec2ec1703 100644
--- a/pkgs/applications/graphics/seg3d/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/seg3d/default.nix
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/nixpkgs/pkgs/applications/graphics/shotwell/default.nix
index 294737ee7335..294737ee7335 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 18754b2b854b..18754b2b854b 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 377a5ae61687..377a5ae61687 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 7046caad295e..7046caad295e 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 d0f2a48c589d..d0f2a48c589d 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 acbbf73465df..acbbf73465df 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 b399dd2d2284..b399dd2d2284 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 840c87de216b..840c87de216b 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 c431f1d97c26..c431f1d97c26 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 08512a5cdd9d..08512a5cdd9d 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 23713271c409..23713271c409 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 df321023c741..df321023c741 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 365d68a9ee76..365d68a9ee76 100644
--- a/pkgs/applications/graphics/tesseract/wrapper.nix
+++ b/nixpkgs/pkgs/applications/graphics/tesseract/wrapper.nix
diff --git a/pkgs/applications/graphics/timelapse-deflicker/default.nix b/nixpkgs/pkgs/applications/graphics/timelapse-deflicker/default.nix
index b4ddb1436856..b4ddb1436856 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 50cd9485a3e8..50cd9485a3e8 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 3a139f3740cc..3a139f3740cc 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 5afd7a0237d0..5afd7a0237d0 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 5fc7e309f4df..5fc7e309f4df 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 8d6eca7ef32c..8d6eca7ef32c 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 e11bc3dd5bb9..e11bc3dd5bb9 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 182f68f3112c..182f68f3112c 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 dd3061461868..dd3061461868 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 5c95d401a323..5c95d401a323 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 56388a8a2555..56388a8a2555 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 429af12b9bb3..429af12b9bb3 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 2269f1c18f14..2269f1c18f14 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 cd9d068b8acf..cd9d068b8acf 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 2487b093148a..2487b093148a 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 69ab67dffb73..69ab67dffb73 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 3cf42343658c..3cf42343658c 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 799ceef1beda..799ceef1beda 100644
--- a/pkgs/applications/graphics/yed/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/yed/default.nix
diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/nixpkgs/pkgs/applications/graphics/zgrviewer/default.nix
index ac3d303a7a60..ac3d303a7a60 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 7a49e5b2cb7f..7a49e5b2cb7f 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 0b5ad092d72d..0b5ad092d72d 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 ce6b6f75f93c..ce6b6f75f93c 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 b09058b60be9..b09058b60be9 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 cc1acbc6dd05..cc1acbc6dd05 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 0ed958b4e770..0ed958b4e770 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 72c4d799239c..72c4d799239c 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 617c086ad9c9..617c086ad9c9 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 24ed20fd83fb..24ed20fd83fb 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 fcbbbbb72eb3..fcbbbbb72eb3 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 25a835f5ba24..25a835f5ba24 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 cba0b1e59e3a..cba0b1e59e3a 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 f828d503cc77..f828d503cc77 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 1470406d5a43..1470406d5a43 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 98d53bc80838..98d53bc80838 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 598857f2e70d..598857f2e70d 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 3479b6600fc9..3479b6600fc9 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 485397ec4aac..485397ec4aac 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 01df2bd26316..01df2bd26316 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 5580952f40a0..5580952f40a0 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 241bb71983a0..241bb71983a0 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 9dd55ec4b9c1..9dd55ec4b9c1 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 495491f6d3c1..495491f6d3c1 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 bd96cb966933..bd96cb966933 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 aa03425f36a0..aa03425f36a0 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 a3be5be7f0a2..a3be5be7f0a2 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 bb8a97e8341e..bb8a97e8341e 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 ebb81248475f..ebb81248475f 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 9095599ea56b..9095599ea56b 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 ceb928acdf2f..ceb928acdf2f 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 8224b98253b6..8224b98253b6 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 9b16485cfa77..9b16485cfa77 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 b4b0450e78bf..b4b0450e78bf 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 9978e7ff6674..9978e7ff6674 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 46832477cc60..46832477cc60 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 e6b4f6b6bdd4..e6b4f6b6bdd4 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 91faaef623a4..91faaef623a4 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 3cb89cb4daa6..3cb89cb4daa6 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 4ac9c9b925af..4ac9c9b925af 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 1628af7e2202..1628af7e2202 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 4af712b1d5a5..4af712b1d5a5 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 45b32fbe832c..45b32fbe832c 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 12b3198a26b2..12b3198a26b2 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 800c92511de2..800c92511de2 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 a58e1b25a2ee..a58e1b25a2ee 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 e5f5b88ec440..e5f5b88ec440 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 6ae45057f19e..6ae45057f19e 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 d251eb74f274..d251eb74f274 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 a42210e6e403..a42210e6e403 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 75c1bf5be8bf..75c1bf5be8bf 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 6189e8706db0..6189e8706db0 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 02c369cc4ee8..02c369cc4ee8 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 1e8a52b55e96..1e8a52b55e96 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 46722ff5fba0..46722ff5fba0 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 6d7bd0daa96b..6d7bd0daa96b 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 cc3e104775ff..cc3e104775ff 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 eef94fd5eb24..eef94fd5eb24 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 df301af0cbac..df301af0cbac 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 57741c03ad54..57741c03ad54 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 10932b38032c..10932b38032c 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 c96c198cca9c..c96c198cca9c 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 6a50f1d08d1c..6a50f1d08d1c 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 944cff47e0d6..944cff47e0d6 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 69b629bbeb90..69b629bbeb90 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 92fcc2387797..92fcc2387797 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 7b8589077952..7b8589077952 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 9e42c5710583..9e42c5710583 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 a7aa817576fb..a7aa817576fb 100644
--- a/pkgs/applications/kde/kio-extras.nix
+++ b/nixpkgs/pkgs/applications/kde/kio-extras.nix
diff --git a/pkgs/applications/kde/kitinerary.nix b/nixpkgs/pkgs/applications/kde/kitinerary.nix
index 8112460549b4..8112460549b4 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 14a8aea5e67a..14a8aea5e67a 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 c15c6eb78d69..c15c6eb78d69 100644
--- a/pkgs/applications/kde/kleopatra.nix
+++ b/nixpkgs/pkgs/applications/kde/kleopatra.nix
diff --git a/pkgs/applications/kde/kmail-account-wizard.nix b/nixpkgs/pkgs/applications/kde/kmail-account-wizard.nix
index f380315cce90..f380315cce90 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 a58b3b8c45d8..a58b3b8c45d8 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 71a23be2d839..71a23be2d839 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 703f62aa72c0..703f62aa72c0 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 c1348edf3f6f..c1348edf3f6f 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 4523a69fc1be..4523a69fc1be 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 8010c57d9278..8010c57d9278 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 c0c00f213400..c0c00f213400 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 ced046c2f4e2..ced046c2f4e2 100644
--- a/pkgs/applications/kde/knotes.nix
+++ b/nixpkgs/pkgs/applications/kde/knotes.nix
diff --git a/pkgs/applications/kde/kolourpaint.nix b/nixpkgs/pkgs/applications/kde/kolourpaint.nix
index 4501324a8717..4501324a8717 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 bbaad3a02f83..bbaad3a02f83 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 e6442fea2f9d..e6442fea2f9d 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 cfef018de6cc..cfef018de6cc 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 004fc1c37ae2..004fc1c37ae2 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 bb44762e65c5..bb44762e65c5 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 f2df628f3018..f2df628f3018 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 2f37a1bac0fd..2f37a1bac0fd 100644
--- a/pkgs/applications/kde/korganizer.nix
+++ b/nixpkgs/pkgs/applications/kde/korganizer.nix
diff --git a/pkgs/applications/kde/kpimtextedit.nix b/nixpkgs/pkgs/applications/kde/kpimtextedit.nix
index 4ede854d5460..4ede854d5460 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 e9505a72e85e..e9505a72e85e 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 2b3dc5313d9a..2b3dc5313d9a 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 89ac92bb4745..89ac92bb4745 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 d2b96bf6100e..d2b96bf6100e 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 2018245cfcb2..2018245cfcb2 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 74e83761eb7d..74e83761eb7d 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 6a5f51a17bfe..6a5f51a17bfe 100644
--- a/pkgs/applications/kde/ksmtp/default.nix
+++ b/nixpkgs/pkgs/applications/kde/ksmtp/default.nix
diff --git a/pkgs/applications/kde/ksystemlog.nix b/nixpkgs/pkgs/applications/kde/ksystemlog.nix
index bec92d55966d..bec92d55966d 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 b5a3834869db..b5a3834869db 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 64179f2e64dc..64179f2e64dc 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 e39e7e5157d2..e39e7e5157d2 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 69a1b9e99cbb..69a1b9e99cbb 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 3fd486056542..3fd486056542 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 70e3cb0e1956..70e3cb0e1956 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 494b193b8326..494b193b8326 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 92716e40a34f..92716e40a34f 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 8c8d244d6f6e..8c8d244d6f6e 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 998e65f28347..998e65f28347 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 c70d8407fc74..c70d8407fc74 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 0958a0e605f7..0958a0e605f7 100644
--- a/pkgs/applications/kde/libkleo.nix
+++ b/nixpkgs/pkgs/applications/kde/libkleo.nix
diff --git a/pkgs/applications/kde/libkomparediff2.nix b/nixpkgs/pkgs/applications/kde/libkomparediff2.nix
index cae2aec5668d..cae2aec5668d 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 f92f21de7fb8..f92f21de7fb8 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 dd33f759c313..dd33f759c313 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 44edea8f55e9..44edea8f55e9 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 f002ff0f3403..f002ff0f3403 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 b02e29e33513..b02e29e33513 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 0704003353ae..0704003353ae 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 23920a081c06..23920a081c06 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 cd98d56b86dd..cd98d56b86dd 100644
--- a/pkgs/applications/kde/minuet.nix
+++ b/nixpkgs/pkgs/applications/kde/minuet.nix
diff --git a/pkgs/applications/kde/okular.nix b/nixpkgs/pkgs/applications/kde/okular.nix
index 39fb232b3421..39fb232b3421 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 d17ffb3c0444..d17ffb3c0444 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 c83df2e0e498..c83df2e0e498 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 bbbcca13d980..bbbcca13d980 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 8ace4562cbd7..8ace4562cbd7 100644
--- a/pkgs/applications/kde/print-manager.nix
+++ b/nixpkgs/pkgs/applications/kde/print-manager.nix
diff --git a/pkgs/applications/kde/spectacle.nix b/nixpkgs/pkgs/applications/kde/spectacle.nix
index 58eb288f6cc2..58eb288f6cc2 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 43deb08c39f5..43deb08c39f5 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/nixpkgs/pkgs/applications/kde/srcs.nix
diff --git a/pkgs/applications/misc/1password/default.nix b/nixpkgs/pkgs/applications/misc/1password/default.nix
index 79c3a6d7302f..79c3a6d7302f 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 f87bd4c11ec4..f87bd4c11ec4 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 41281385c990..41281385c990 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 0ca12a0096ed..0ca12a0096ed 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 3e5bf8df4a7b..3e5bf8df4a7b 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 490c83bed078..490c83bed078 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 2dda615081c0..2dda615081c0 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 4997a9c7f2ac..4997a9c7f2ac 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 1c769e58705a..1c769e58705a 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 f21438dfcec5..f21438dfcec5 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 710ddfec9942..710ddfec9942 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 37d140e19ba3..37d140e19ba3 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 e78ba2df9993..e78ba2df9993 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 0530ec9c1b80..0530ec9c1b80 100644
--- a/pkgs/applications/misc/appeditor/default.nix
+++ b/nixpkgs/pkgs/applications/misc/appeditor/default.nix
diff --git a/pkgs/applications/misc/apvlv/default.nix b/nixpkgs/pkgs/applications/misc/apvlv/default.nix
index 2da0de9ead8c..2da0de9ead8c 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 d2a7831dca63..d2a7831dca63 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 03f534e1a4da..03f534e1a4da 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 202c1669f858..202c1669f858 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 08d9c4787369..08d9c4787369 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 3c18d70d6c26..3c18d70d6c26 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 622e7169faec..622e7169faec 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 7c4e6ff8c3d7..7c4e6ff8c3d7 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 0add5ed78cc5..0add5ed78cc5 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 09b75e27d46a..09b75e27d46a 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 2dd151c1a6c1..2dd151c1a6c1 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 ea744ed6648f..ea744ed6648f 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 4227b4155acf..4227b4155acf 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 6151b3d55ab7..6151b3d55ab7 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 fc5fa4d03006..fc5fa4d03006 100644
--- a/pkgs/applications/misc/bashSnippets/default.nix
+++ b/nixpkgs/pkgs/applications/misc/bashSnippets/default.nix
diff --git a/pkgs/applications/misc/batti/default.nix b/nixpkgs/pkgs/applications/misc/batti/default.nix
index 9322aefb2d69..9322aefb2d69 100644
--- a/pkgs/applications/misc/batti/default.nix
+++ b/nixpkgs/pkgs/applications/misc/batti/default.nix
diff --git a/pkgs/applications/misc/bb/default.nix b/nixpkgs/pkgs/applications/misc/bb/default.nix
index f085e4bd7dd5..f085e4bd7dd5 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 89c32668be9c..89c32668be9c 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 41184d6e9492..41184d6e9492 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 22eb3e3d8594..22eb3e3d8594 100644
--- a/pkgs/applications/misc/bicon/default.nix
+++ b/nixpkgs/pkgs/applications/misc/bicon/default.nix
diff --git a/pkgs/applications/misc/bitcoinarmory/default.nix b/nixpkgs/pkgs/applications/misc/bitcoinarmory/default.nix
index 9c99dcee2b3c..9c99dcee2b3c 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 3f13972de9bb..3f13972de9bb 100644
--- a/pkgs/applications/misc/bleachbit/default.nix
+++ b/nixpkgs/pkgs/applications/misc/bleachbit/default.nix
diff --git a/pkgs/applications/misc/blender/default.nix b/nixpkgs/pkgs/applications/misc/blender/default.nix
index 5445c7efb59b..5445c7efb59b 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 44e2147d073c..44e2147d073c 100644
--- a/pkgs/applications/misc/blender/fix-include.patch
+++ b/nixpkgs/pkgs/applications/misc/blender/fix-include.patch
diff --git a/pkgs/applications/misc/buku/default.nix b/nixpkgs/pkgs/applications/misc/buku/default.nix
index 60ade661cffd..60ade661cffd 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 a15814082014..a15814082014 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 c05b98a07283..c05b98a07283 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 9ef1dd04251d..9ef1dd04251d 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 5164b80a0bee..5164b80a0bee 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 faaaf2c19949..faaaf2c19949 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 35aa681df4ba..35aa681df4ba 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 a0e5c8149968..a0e5c8149968 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 e48b32a783d7..e48b32a783d7 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 3a9f20289227..3a9f20289227 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 397aed355a95..397aed355a95 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 75f5ab406fe0..75f5ab406fe0 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 44612644359c..44612644359c 100644
--- a/pkgs/applications/misc/cbatticon/default.nix
+++ b/nixpkgs/pkgs/applications/misc/cbatticon/default.nix
diff --git a/pkgs/applications/misc/cdrtools/default.nix b/nixpkgs/pkgs/applications/misc/cdrtools/default.nix
index 3738fb83c705..3738fb83c705 100644
--- a/pkgs/applications/misc/cdrtools/default.nix
+++ b/nixpkgs/pkgs/applications/misc/cdrtools/default.nix
diff --git a/pkgs/applications/misc/cdrtools/fix-paths.patch b/nixpkgs/pkgs/applications/misc/cdrtools/fix-paths.patch
index f4a541210880..f4a541210880 100644
--- a/pkgs/applications/misc/cdrtools/fix-paths.patch
+++ b/nixpkgs/pkgs/applications/misc/cdrtools/fix-paths.patch
diff --git a/pkgs/applications/misc/cgminer/default.nix b/nixpkgs/pkgs/applications/misc/cgminer/default.nix
index 9d63b5aedcb7..9d63b5aedcb7 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 41660bc7f2b0..41660bc7f2b0 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 0578393dfca0..0578393dfca0 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 1f80cde03b75..1f80cde03b75 100644
--- a/pkgs/applications/misc/cherrytree/subprocess.patch
+++ b/nixpkgs/pkgs/applications/misc/cherrytree/subprocess.patch
diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/nixpkgs/pkgs/applications/misc/cli-visualizer/default.nix
index 6602adb2f2ab..6602adb2f2ab 100644
--- a/pkgs/applications/misc/cli-visualizer/default.nix
+++ b/nixpkgs/pkgs/applications/misc/cli-visualizer/default.nix
diff --git a/pkgs/applications/misc/clipit/default.nix b/nixpkgs/pkgs/applications/misc/clipit/default.nix
index 4477cbbcc06a..4477cbbcc06a 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 7a47a0e3bc0b..7a47a0e3bc0b 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 28f14cc1435f..28f14cc1435f 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 b973c73c0dd8..b973c73c0dd8 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 554c7d8c78bb..554c7d8c78bb 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 3851730c4596..3851730c4596 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 f2372aa51e68..f2372aa51e68 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 3ee357ce151b..3ee357ce151b 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 0601514546f2..0601514546f2 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 4d9975192461..4d9975192461 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 2d612c16fef3..2d612c16fef3 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 0123e0c38d74..0123e0c38d74 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 2675a5f4fc5d..2675a5f4fc5d 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 290801ea5781..290801ea5781 100644
--- a/pkgs/applications/misc/cura/default.nix
+++ b/nixpkgs/pkgs/applications/misc/cura/default.nix
diff --git a/pkgs/applications/misc/cura/lulzbot.nix b/nixpkgs/pkgs/applications/misc/cura/lulzbot.nix
index f3f1972f6e6e..f3f1972f6e6e 100644
--- a/pkgs/applications/misc/cura/lulzbot.nix
+++ b/nixpkgs/pkgs/applications/misc/cura/lulzbot.nix
diff --git a/pkgs/applications/misc/cura/numpy-cast.patch b/nixpkgs/pkgs/applications/misc/cura/numpy-cast.patch
index efb14182b3e6..efb14182b3e6 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 a5a196a78100..a5a196a78100 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 a53b001b0e98..a53b001b0e98 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 4e620425d5c3..4e620425d5c3 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 a7339acddee2..a7339acddee2 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 ce743a008798..ce743a008798 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 77a25f2755f0..77a25f2755f0 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 fbeb965df380..fbeb965df380 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 b010e5401b80..b010e5401b80 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 7f4629100d5d..7f4629100d5d 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 4fb9ca5fa713..4fb9ca5fa713 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 eeb7a8ccf526..eeb7a8ccf526 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 467c2b3c2d59..467c2b3c2d59 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 daea20835c8a..daea20835c8a 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 9535ea2c6b0d..9535ea2c6b0d 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 58bc483d43f3..58bc483d43f3 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 e76f95b6a50d..e76f95b6a50d 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 70ecea10550e..70ecea10550e 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 f1e33ea53571..f1e33ea53571 100644
--- a/pkgs/applications/misc/direwolf/default.nix
+++ b/nixpkgs/pkgs/applications/misc/direwolf/default.nix
diff --git a/pkgs/applications/misc/djvulibre/default.nix b/nixpkgs/pkgs/applications/misc/djvulibre/default.nix
index 0b685e04a6fc..0b685e04a6fc 100644
--- a/pkgs/applications/misc/djvulibre/default.nix
+++ b/nixpkgs/pkgs/applications/misc/djvulibre/default.nix
diff --git a/pkgs/applications/misc/dmensamenu/default.nix b/nixpkgs/pkgs/applications/misc/dmensamenu/default.nix
index 1c3b41338674..1c3b41338674 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 1508e5142d29..1508e5142d29 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 e6b62817b907..e6b62817b907 100644
--- a/pkgs/applications/misc/dmenu/default.nix
+++ b/nixpkgs/pkgs/applications/misc/dmenu/default.nix
diff --git a/pkgs/applications/misc/dmenu2/default.nix b/nixpkgs/pkgs/applications/misc/dmenu2/default.nix
index 3d5676033593..3d5676033593 100644
--- a/pkgs/applications/misc/dmenu2/default.nix
+++ b/nixpkgs/pkgs/applications/misc/dmenu2/default.nix
diff --git a/pkgs/applications/misc/dockbarx/default.nix b/nixpkgs/pkgs/applications/misc/dockbarx/default.nix
index 3888c4ce0a0d..3888c4ce0a0d 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 2706a85e9d89..2706a85e9d89 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 4d266827415f..4d266827415f 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 9ae2ea41d831..9ae2ea41d831 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 b30a124bb58b..b30a124bb58b 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 fd08ed9c3916..fd08ed9c3916 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 08654c2384cb..08654c2384cb 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 e21b53b3cc53..e21b53b3cc53 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 1d3c405b7038..1d3c405b7038 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 b5ae9fb567ca..b5ae9fb567ca 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 45b76e159a11..45b76e159a11 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 35073db2ae14..35073db2ae14 100644
--- a/pkgs/applications/misc/dunst/default.nix
+++ b/nixpkgs/pkgs/applications/misc/dunst/default.nix
diff --git a/pkgs/applications/misc/eaglemode/default.nix b/nixpkgs/pkgs/applications/misc/eaglemode/default.nix
index 6c802e683ce9..6c802e683ce9 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 cc7b9cf27c2a..cc7b9cf27c2a 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 98ed10b0c7cc..98ed10b0c7cc 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 0de055df5698..0de055df5698 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 a5e4bd74a6eb..a5e4bd74a6eb 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 247fabe3891f..247fabe3891f 100644
--- a/pkgs/applications/misc/electrum/update.nix
+++ b/nixpkgs/pkgs/applications/misc/electrum/update.nix
diff --git a/pkgs/applications/misc/emem/default.nix b/nixpkgs/pkgs/applications/misc/emem/default.nix
index d447e7f50d52..d447e7f50d52 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 b6c10dbebcad..b6c10dbebcad 100644
--- a/pkgs/applications/misc/epdfview/default.nix
+++ b/nixpkgs/pkgs/applications/misc/epdfview/default.nix
diff --git a/pkgs/applications/misc/et/default.nix b/nixpkgs/pkgs/applications/misc/et/default.nix
index 4aaaa3339982..4aaaa3339982 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 98b47990314d..98b47990314d 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 b8bd0a59bea2..b8bd0a59bea2 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 c7fcf18e4e3d..c7fcf18e4e3d 100644
--- a/pkgs/applications/misc/evilvte/default.nix
+++ b/nixpkgs/pkgs/applications/misc/evilvte/default.nix
diff --git a/pkgs/applications/misc/evtest/default.nix b/nixpkgs/pkgs/applications/misc/evtest/default.nix
index 3d715a1d16bd..3d715a1d16bd 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 21fed2e28def..21fed2e28def 100644
--- a/pkgs/applications/misc/exercism/default.nix
+++ b/nixpkgs/pkgs/applications/misc/exercism/default.nix
diff --git a/pkgs/applications/misc/exercism/deps.nix b/nixpkgs/pkgs/applications/misc/exercism/deps.nix
index 10a6baa2241b..10a6baa2241b 100644
--- a/pkgs/applications/misc/exercism/deps.nix
+++ b/nixpkgs/pkgs/applications/misc/exercism/deps.nix
diff --git a/pkgs/applications/misc/extract_url/default.nix b/nixpkgs/pkgs/applications/misc/extract_url/default.nix
index 2b7888c9cd04..2b7888c9cd04 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 51e9c4371b5b..51e9c4371b5b 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 e7d0e6a63a59..e7d0e6a63a59 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 cbac290e69c2..cbac290e69c2 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 db78f2ec9204..db78f2ec9204 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 0c06e53f9814..0c06e53f9814 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 e9d194666094..e9d194666094 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 e87c86f1b4b3..e87c86f1b4b3 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 edee9ab33e9e..edee9ab33e9e 100644
--- a/pkgs/applications/misc/filet/default.nix
+++ b/nixpkgs/pkgs/applications/misc/filet/default.nix
diff --git a/pkgs/applications/misc/flamerobin/default.nix b/nixpkgs/pkgs/applications/misc/flamerobin/default.nix
index f70042884a8a..f70042884a8a 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 4e786bfb36f8..4e786bfb36f8 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 f0da4e883517..f0da4e883517 100644
--- a/pkgs/applications/misc/font-manager/default.nix
+++ b/nixpkgs/pkgs/applications/misc/font-manager/default.nix
diff --git a/pkgs/applications/misc/freemind/default.nix b/nixpkgs/pkgs/applications/misc/freemind/default.nix
index 5152c8aa3f7c..5152c8aa3f7c 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 00e11858fb41..00e11858fb41 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 062bca5b215e..062bca5b215e 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 44071b328758..44071b328758 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 cb04be4b6ea9..cb04be4b6ea9 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 d41aa432cf35..d41aa432cf35 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 739df59b31c5..739df59b31c5 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 22b49a5a2ffe..22b49a5a2ffe 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 dd0a5c9a4f60..dd0a5c9a4f60 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 b97b079ab663..b97b079ab663 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 a3aebf227339..a3aebf227339 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 6f380114a276..6f380114a276 100644
--- a/pkgs/applications/misc/gcalcli/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gcalcli/default.nix
diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/nixpkgs/pkgs/applications/misc/get_iplayer/default.nix
index baf2f5165d6d..baf2f5165d6d 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 a77f87f6f1f1..a77f87f6f1f1 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 4d990c69b4a3..4d990c69b4a3 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 b4fac899f66f..b4fac899f66f 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 4af776674e63..4af776674e63 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 fd711a321acf..fd711a321acf 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 3831780c7919..3831780c7919 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 9e71837c0f5d..9e71837c0f5d 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 47fb50242c1d..47fb50242c1d 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 12d5370961c0..12d5370961c0 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 60e4338e893d..60e4338e893d 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 b5cd41a3c5b4..b5cd41a3c5b4 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 bb1556c7c4dc..bb1556c7c4dc 100644
--- a/pkgs/applications/misc/gmtp/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gmtp/default.nix
diff --git a/pkgs/applications/misc/gnome-recipes/default.nix b/nixpkgs/pkgs/applications/misc/gnome-recipes/default.nix
index 01f5af339ff0..01f5af339ff0 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 eecf9bbd88f7..eecf9bbd88f7 100644
--- a/pkgs/applications/misc/gnome-usage/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gnome-usage/default.nix
diff --git a/pkgs/applications/misc/gnome15/default.nix b/nixpkgs/pkgs/applications/misc/gnome15/default.nix
index e2cf8245ce67..e2cf8245ce67 100644
--- a/pkgs/applications/misc/gnome15/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gnome15/default.nix
diff --git a/pkgs/applications/misc/go-jira/default.nix b/nixpkgs/pkgs/applications/misc/go-jira/default.nix
index b80ddb8f303f..b80ddb8f303f 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 edf16f806a6b..edf16f806a6b 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 42d5d83f7bdb..42d5d83f7bdb 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 525f54838b75..525f54838b75 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 9a12ba2bfd55..9a12ba2bfd55 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 4a0a4e38a61b..4a0a4e38a61b 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 6de5553ac7cf..6de5553ac7cf 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 0fccf83acf76..0fccf83acf76 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 3dcbcaf38b87..3dcbcaf38b87 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 464e0ba53346..464e0ba53346 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 4a715b6d8591..4a715b6d8591 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 a48890144127..a48890144127 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 4143f6fde559..4143f6fde559 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 d06970e8d07c..d06970e8d07c 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 7b23fca2121e..7b23fca2121e 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 aa0ed5f64632..aa0ed5f64632 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 5bcaccb43bcf..5bcaccb43bcf 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 4f0c1864677c..4f0c1864677c 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 a5ee6c8e4ae5..a5ee6c8e4ae5 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 9fef93819492..9fef93819492 100644
--- a/pkgs/applications/misc/gpx/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gpx/default.nix
diff --git a/pkgs/applications/misc/gpxsee/default.nix b/nixpkgs/pkgs/applications/misc/gpxsee/default.nix
index 8c9833ae40d1..8c9833ae40d1 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 e9026ded4702..e9026ded4702 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 00421a2e0334..00421a2e0334 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 cfcab32aac99..cfcab32aac99 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 9274c2d05216..9274c2d05216 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 cb407fca66cb..cb407fca66cb 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 3e1bb31091f8..3e1bb31091f8 100644
--- a/pkgs/applications/misc/grsync/default.nix
+++ b/nixpkgs/pkgs/applications/misc/grsync/default.nix
diff --git a/pkgs/applications/misc/gsimplecal/default.nix b/nixpkgs/pkgs/applications/misc/gsimplecal/default.nix
index 7f3b3a8d6dc5..7f3b3a8d6dc5 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 8f683272e120..8f683272e120 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 37352915cb84..37352915cb84 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 1e237923d054..1e237923d054 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 f94f8f5dd707..f94f8f5dd707 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 a9e6d905c284..a9e6d905c284 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 7d19a9cb1108..7d19a9cb1108 100644
--- a/pkgs/applications/misc/gxneur/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gxneur/default.nix
diff --git a/pkgs/applications/misc/hamster-time-tracker/default.nix b/nixpkgs/pkgs/applications/misc/hamster-time-tracker/default.nix
index 9360e220ab6a..9360e220ab6a 100644
--- a/pkgs/applications/misc/hamster-time-tracker/default.nix
+++ b/nixpkgs/pkgs/applications/misc/hamster-time-tracker/default.nix
diff --git a/pkgs/applications/misc/haxor-news/default.nix b/nixpkgs/pkgs/applications/misc/haxor-news/default.nix
index 7353078600d1..7353078600d1 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 e2f5f653d47c..e2f5f653d47c 100644
--- a/pkgs/applications/misc/hdate/default.nix
+++ b/nixpkgs/pkgs/applications/misc/hdate/default.nix
diff --git a/pkgs/applications/misc/hello-unfree/default.nix b/nixpkgs/pkgs/applications/misc/hello-unfree/default.nix
index 1647a09edfd6..1647a09edfd6 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 63a8af99f7cf..63a8af99f7cf 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 0431f35057be..0431f35057be 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 607dff293189..607dff293189 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 500f1df36a0c..500f1df36a0c 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 ba23078bba93..ba23078bba93 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 2fd56e3c5552..2fd56e3c5552 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 1eae8c57fc4e..1eae8c57fc4e 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 acdeec10d300..acdeec10d300 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 f39860fac583..f39860fac583 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 c4c1caf55db4..c4c1caf55db4 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 0bb3f15fdc18..0bb3f15fdc18 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 2fd7e2f94af0..2fd7e2f94af0 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 c0c1faef09d2..c0c1faef09d2 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 957f0f7f68bb..957f0f7f68bb 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/nixpkgs/pkgs/applications/misc/ikiwiki/default.nix
diff --git a/pkgs/applications/misc/img2pdf/default.nix b/nixpkgs/pkgs/applications/misc/img2pdf/default.nix
index 902e9268f722..902e9268f722 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 d9bccee889ab..d9bccee889ab 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 b5fa9143ddbb..b5fa9143ddbb 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 e493226be60a..e493226be60a 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 e717c58f30f1..e717c58f30f1 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 c20fa4ed9d9b..c20fa4ed9d9b 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 5939d7789b4e..5939d7789b4e 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 2d3446a81134..2d3446a81134 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 7954b6dc03ed..7954b6dc03ed 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 741b5e2a0691..741b5e2a0691 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 9ae9ab254e80..9ae9ab254e80 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 aba5e06e3769..aba5e06e3769 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 7baf6a45fc54..7baf6a45fc54 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 63209d4ff45a..63209d4ff45a 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 528f1062c733..528f1062c733 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 6ba0bed78476..6ba0bed78476 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 3561fcde839d..3561fcde839d 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 17b1749fcf77..17b1749fcf77 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 410b04d5dcbd..410b04d5dcbd 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 4f7acb7731ab..4f7acb7731ab 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/nixpkgs/pkgs/applications/misc/josm/default.nix
diff --git a/pkgs/applications/misc/jp2a/default.nix b/nixpkgs/pkgs/applications/misc/jp2a/default.nix
index 138ee397d3fd..138ee397d3fd 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 3260f6a50690..3260f6a50690 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 7c5845b35419..7c5845b35419 100644
--- a/pkgs/applications/misc/k2pdfopt/default.nix
+++ b/nixpkgs/pkgs/applications/misc/k2pdfopt/default.nix
diff --git a/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch b/nixpkgs/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch
index cf7e4896b803..cf7e4896b803 100644
--- a/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch
+++ b/nixpkgs/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch
diff --git a/pkgs/applications/misc/k2pdfopt/leptonica-CVE-2018-3836.patch b/nixpkgs/pkgs/applications/misc/k2pdfopt/leptonica-CVE-2018-3836.patch
index f1b4170fbaae..f1b4170fbaae 100644
--- a/pkgs/applications/misc/k2pdfopt/leptonica-CVE-2018-3836.patch
+++ b/nixpkgs/pkgs/applications/misc/k2pdfopt/leptonica-CVE-2018-3836.patch
diff --git a/pkgs/applications/misc/k2pdfopt/tesseract.patch b/nixpkgs/pkgs/applications/misc/k2pdfopt/tesseract.patch
index b882f5b949c3..b882f5b949c3 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 ecfcc7717281..ecfcc7717281 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 b518481e29ad..b518481e29ad 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 b92a7ac476c9..b92a7ac476c9 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 80bf5deceb16..80bf5deceb16 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 e64632d529b1..e64632d529b1 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 b45cb24b1b51..b45cb24b1b51 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/default.nix b/nixpkgs/pkgs/applications/misc/keepass/default.nix
index b954d2d3cdb8..b954d2d3cdb8 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 04485b146a04..04485b146a04 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 318f8a358985..318f8a358985 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 ca52e7ef191a..ca52e7ef191a 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 cde6e7252bc3..cde6e7252bc3 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 8a3aaf202a70..8a3aaf202a70 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 b52cff784e5f..b52cff784e5f 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 d7ffb7dbba1f..d7ffb7dbba1f 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 05ad9b05abb0..05ad9b05abb0 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 0a0b26f6e8c9..0a0b26f6e8c9 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 2e32bbd611a1..2e32bbd611a1 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/nixpkgs/pkgs/applications/misc/khal/default.nix
diff --git a/pkgs/applications/misc/khard/default.nix b/nixpkgs/pkgs/applications/misc/khard/default.nix
index 61eb959a1dda..61eb959a1dda 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 9b77bdcd2a54..9b77bdcd2a54 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 704605813071..704605813071 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/no-lto.patch b/nixpkgs/pkgs/applications/misc/kitty/no-lto.patch
index 44d231cb07f9..44d231cb07f9 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 8217b5ef51a6..8217b5ef51a6 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 d2d0806c862f..d2d0806c862f 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 bc49e810d4e5..bc49e810d4e5 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/nixpkgs/pkgs/applications/misc/kiwix/default.nix
diff --git a/pkgs/applications/misc/krename/default.nix b/nixpkgs/pkgs/applications/misc/krename/default.nix
index 8b6b7741c7df..8b6b7741c7df 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 70915ca87073..70915ca87073 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 81cba3f56378..81cba3f56378 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 bdbdef45fe7b..bdbdef45fe7b 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 9018a5926424..9018a5926424 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 c9583961de41..c9583961de41 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 c049ed2374fd..c049ed2374fd 100644
--- a/pkgs/applications/misc/librecad/default.nix
+++ b/nixpkgs/pkgs/applications/misc/librecad/default.nix
diff --git a/pkgs/applications/misc/lifelines/default.nix b/nixpkgs/pkgs/applications/misc/lifelines/default.nix
index 7207dea9d522..7207dea9d522 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 7b5b40d65a36..7b5b40d65a36 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 948ae7b14a11..948ae7b14a11 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 5ae652d750d1..5ae652d750d1 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 25d503290ce8..25d503290ce8 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 291e225d6c4f..291e225d6c4f 100644
--- a/pkgs/applications/misc/loxodo/default.nix
+++ b/nixpkgs/pkgs/applications/misc/loxodo/default.nix
diff --git a/pkgs/applications/misc/ltwheelconf/default.nix b/nixpkgs/pkgs/applications/misc/ltwheelconf/default.nix
index 4972aa28e589..4972aa28e589 100644
--- a/pkgs/applications/misc/ltwheelconf/default.nix
+++ b/nixpkgs/pkgs/applications/misc/ltwheelconf/default.nix
diff --git a/pkgs/applications/misc/lutris/default.nix b/nixpkgs/pkgs/applications/misc/lutris/default.nix
index 5a74bd931c0b..5a74bd931c0b 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 4fd86a5a4f52..4fd86a5a4f52 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 598f506118f2..598f506118f2 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 ad3bd499cde9..ad3bd499cde9 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 f2dacb7890f0..f2dacb7890f0 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 9f94bb09ce4e..9f94bb09ce4e 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 80b9ebf4d571..80b9ebf4d571 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 a6af1762e289..a6af1762e289 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 32aa15b09e49..32aa15b09e49 100644
--- a/pkgs/applications/misc/mako/default.nix
+++ b/nixpkgs/pkgs/applications/misc/mako/default.nix
diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/nixpkgs/pkgs/applications/misc/masterpdfeditor/default.nix
index 7acebfad488b..7acebfad488b 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 6c58dde00d36..6c58dde00d36 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 0d9fffd1bb7e..0d9fffd1bb7e 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 8bbb179d9d51..8bbb179d9d51 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/nixpkgs/pkgs/applications/misc/mediainfo/default.nix
diff --git a/pkgs/applications/misc/megasync/default.nix b/nixpkgs/pkgs/applications/misc/megasync/default.nix
index b3e739864171..b3e739864171 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 7d8748528e7f..7d8748528e7f 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 bbf100737bc4..bbf100737bc4 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 c112cf0c928f..c112cf0c928f 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 df0a4db7fc70..df0a4db7fc70 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 56854e7863fe..56854e7863fe 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 0833464f2c25..0833464f2c25 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 602d4a032efd..602d4a032efd 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 ca4f91533ecf..ca4f91533ecf 100644
--- a/pkgs/applications/misc/metar/default.nix
+++ b/nixpkgs/pkgs/applications/misc/metar/default.nix
diff --git a/pkgs/applications/misc/milu/default.nix b/nixpkgs/pkgs/applications/misc/milu/default.nix
index 09c4d1db2904..09c4d1db2904 100644
--- a/pkgs/applications/misc/milu/default.nix
+++ b/nixpkgs/pkgs/applications/misc/milu/default.nix
diff --git a/pkgs/applications/misc/minergate-cli/default.nix b/nixpkgs/pkgs/applications/misc/minergate-cli/default.nix
index 6aa7eea3d7e9..6aa7eea3d7e9 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 d11e889e932c..d11e889e932c 100644
--- a/pkgs/applications/misc/minergate/default.nix
+++ b/nixpkgs/pkgs/applications/misc/minergate/default.nix
diff --git a/pkgs/applications/misc/mlterm/default.nix b/nixpkgs/pkgs/applications/misc/mlterm/default.nix
index 2cfa6010853f..2cfa6010853f 100644
--- a/pkgs/applications/misc/mlterm/default.nix
+++ b/nixpkgs/pkgs/applications/misc/mlterm/default.nix
diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix
index 920c1c3f095b..920c1c3f095b 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 b9179bbe5463..b9179bbe5463 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 4081cd1ddaa2..4081cd1ddaa2 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 fffa95952622..fffa95952622 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 eea166d8df75..eea166d8df75 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 d93d3c468145..d93d3c468145 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 a6efb19b5774..a6efb19b5774 100644
--- a/pkgs/applications/misc/mrxvt/default.nix
+++ b/nixpkgs/pkgs/applications/misc/mrxvt/default.nix
diff --git a/pkgs/applications/misc/mucommander/default.nix b/nixpkgs/pkgs/applications/misc/mucommander/default.nix
index d6153d2268b6..d6153d2268b6 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 a2678d6067f9..a2678d6067f9 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 be1b84b0012f..be1b84b0012f 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 38f5075d10f2..38f5075d10f2 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 852233633ca5..852233633ca5 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 131a1bbbf6bd..131a1bbbf6bd 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 c08a21e87978..c08a21e87978 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 cccd36d7ead8..cccd36d7ead8 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 0a5c31fd40a2..0a5c31fd40a2 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 dddf992e4c12..dddf992e4c12 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 45b83b727485..45b83b727485 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 022829040b81..022829040b81 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 9a40e3bc1053..9a40e3bc1053 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 7f8a75f319be..7f8a75f319be 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 8dc288c01625..8dc288c01625 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 21a5ab0cd0f6..21a5ab0cd0f6 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 1b800f654340..1b800f654340 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 882bb75219d6..882bb75219d6 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 e97452249bcf..e97452249bcf 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 50a6dadadb5c..50a6dadadb5c 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 715196871512..715196871512 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 7e99f8f5b86a..7e99f8f5b86a 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 24235f43a114..24235f43a114 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 836bfd5f3e0a..836bfd5f3e0a 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/libnsutils/default.nix b/nixpkgs/pkgs/applications/misc/netsurf/libnsutils/default.nix
index 1e8dbe271370..1e8dbe271370 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 ed9433b9f570..ed9433b9f570 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/libutf8proc/default.nix b/nixpkgs/pkgs/applications/misc/netsurf/libutf8proc/default.nix
index a905f3a12a8f..a905f3a12a8f 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 509cbeb4503f..509cbeb4503f 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 971e16848ae7..971e16848ae7 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 1cc7f419aa2e..1cc7f419aa2e 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 145abfba5d5c..145abfba5d5c 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 c38a27d55e63..c38a27d55e63 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 bcf2edd8f2f6..bcf2edd8f2f6 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 055728ee046c..055728ee046c 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 a732a5ed536e..a732a5ed536e 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 d4f3db4ca6f9..d4f3db4ca6f9 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 5c60c7412c4a..5c60c7412c4a 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 69f74d66dd01..69f74d66dd01 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 816918ca0638..816918ca0638 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 a604349afb01..a604349afb01 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 c0bacc2c50d2..c0bacc2c50d2 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 24c9c4a80f5d..24c9c4a80f5d 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 d8179e1b402a..d8179e1b402a 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 e16d9354bb43..e16d9354bb43 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 660b5db61058..660b5db61058 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 de2f86e9f9a2..de2f86e9f9a2 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 64acc9b138c4..64acc9b138c4 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 2463c8d5f5ac..2463c8d5f5ac 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 b87f11d7b05d..b87f11d7b05d 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 8ff9a2f44d55..8ff9a2f44d55 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 dd6710f5cfc9..dd6710f5cfc9 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 b8b6e42d5cf5..b8b6e42d5cf5 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 e4f2fd7ce8b9..e4f2fd7ce8b9 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 c98defee57a0..c98defee57a0 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 cd9a86e7fac7..cd9a86e7fac7 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 98ebde981c0a..98ebde981c0a 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 ffb56dbe239c..ffb56dbe239c 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 bc6aa242f338..bc6aa242f338 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 5787adef2a3e..5787adef2a3e 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 bb53782fb7d2..bb53782fb7d2 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 2b35cb770389..2b35cb770389 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 918924df0b97..918924df0b97 100644
--- a/pkgs/applications/misc/overmind/default.nix
+++ b/nixpkgs/pkgs/applications/misc/overmind/default.nix
diff --git a/pkgs/applications/misc/pbpst/default.nix b/nixpkgs/pkgs/applications/misc/pbpst/default.nix
index fcf88200133c..fcf88200133c 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 633c1d82159a..633c1d82159a 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 7fdfbd84d2f6..7fdfbd84d2f6 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 f604684b19a1..f604684b19a1 100644
--- a/pkgs/applications/misc/pdf-quench/default.nix
+++ b/nixpkgs/pkgs/applications/misc/pdf-quench/default.nix
diff --git a/pkgs/applications/misc/pdfdiff/default.nix b/nixpkgs/pkgs/applications/misc/pdfdiff/default.nix
index ee54904bfd66..ee54904bfd66 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 90107be64c72..90107be64c72 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 c0dca0564768..c0dca0564768 100644
--- a/pkgs/applications/misc/pdfpc/default.nix
+++ b/nixpkgs/pkgs/applications/misc/pdfpc/default.nix
diff --git a/pkgs/applications/misc/pell/default.nix b/nixpkgs/pkgs/applications/misc/pell/default.nix
index d55c7a2af12b..d55c7a2af12b 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 8804e438b7e8..8804e438b7e8 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 7e7850668b84..7e7850668b84 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 113a63f7fe18..113a63f7fe18 100644
--- a/pkgs/applications/misc/pgmanage/default.nix
+++ b/nixpkgs/pkgs/applications/misc/pgmanage/default.nix
diff --git a/pkgs/applications/misc/phwmon/default.nix b/nixpkgs/pkgs/applications/misc/phwmon/default.nix
index 0cee74522ab2..0cee74522ab2 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 55093b21f950..55093b21f950 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 8aff573ab839..8aff573ab839 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 ab8a4c723897..ab8a4c723897 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 b33a3e174bc4..b33a3e174bc4 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 b44169adea8d..b44169adea8d 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 e5c096fd2ae5..e5c096fd2ae5 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 0bd28811d55b..0bd28811d55b 100644
--- a/pkgs/applications/misc/plover/default.nix
+++ b/nixpkgs/pkgs/applications/misc/plover/default.nix
diff --git a/pkgs/applications/misc/pmenu/default.nix b/nixpkgs/pkgs/applications/misc/pmenu/default.nix
index 4b39e9291a8a..4b39e9291a8a 100644
--- a/pkgs/applications/misc/pmenu/default.nix
+++ b/nixpkgs/pkgs/applications/misc/pmenu/default.nix
diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/nixpkgs/pkgs/applications/misc/polar-bookshelf/default.nix
index 11c643fac2c3..11c643fac2c3 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 e6507845d4cc..e6507845d4cc 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 45db856dbb9e..45db856dbb9e 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 34144e35bd5a..34144e35bd5a 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 e3aa5600e40e..e3aa5600e40e 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 cd3a46ab09ba..cd3a46ab09ba 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 5ba8e1b6e313..5ba8e1b6e313 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 cc6f63c0960b..cc6f63c0960b 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 7aaa8a8c38d2..7aaa8a8c38d2 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 88cb2d529351..88cb2d529351 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 ed2136ea5b85..ed2136ea5b85 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 501fae0ef0a2..501fae0ef0a2 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 6f9078bb50a7..6f9078bb50a7 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 f1f69c252142..f1f69c252142 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 81e316eb0ee9..81e316eb0ee9 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 435c8b26e6f7..435c8b26e6f7 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 995fffeda2f8..995fffeda2f8 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 1ed54b05ec8c..1ed54b05ec8c 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 bfbee1bea24d..bfbee1bea24d 100644
--- a/pkgs/applications/misc/pydf/default.nix
+++ b/nixpkgs/pkgs/applications/misc/pydf/default.nix
diff --git a/pkgs/applications/misc/pytrainer/default.nix b/nixpkgs/pkgs/applications/misc/pytrainer/default.nix
index cdeca96568df..cdeca96568df 100644
--- a/pkgs/applications/misc/pytrainer/default.nix
+++ b/nixpkgs/pkgs/applications/misc/pytrainer/default.nix
diff --git a/pkgs/applications/misc/pytrainer/fix-test-tz.patch b/nixpkgs/pkgs/applications/misc/pytrainer/fix-test-tz.patch
index ca4875769013..ca4875769013 100644
--- a/pkgs/applications/misc/pytrainer/fix-test-tz.patch
+++ b/nixpkgs/pkgs/applications/misc/pytrainer/fix-test-tz.patch
diff --git a/pkgs/applications/misc/pytrainer/pytrainer-webkit.patch b/nixpkgs/pkgs/applications/misc/pytrainer/pytrainer-webkit.patch
index 0f894c46a53b..0f894c46a53b 100644
--- a/pkgs/applications/misc/pytrainer/pytrainer-webkit.patch
+++ b/nixpkgs/pkgs/applications/misc/pytrainer/pytrainer-webkit.patch
diff --git a/pkgs/applications/misc/qMasterPassword/default.nix b/nixpkgs/pkgs/applications/misc/qMasterPassword/default.nix
index e0a1e33dc628..e0a1e33dc628 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 abf4bb054621..abf4bb054621 100644
--- a/pkgs/applications/misc/qdirstat/default.nix
+++ b/nixpkgs/pkgs/applications/misc/qdirstat/default.nix
diff --git a/pkgs/applications/misc/qlcplus/default.nix b/nixpkgs/pkgs/applications/misc/qlcplus/default.nix
index df5f35102e01..df5f35102e01 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 b38369babe8c..b38369babe8c 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 49993f2f7ea7..49993f2f7ea7 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 e395ae9c070d..e395ae9c070d 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 263bc37660c9..263bc37660c9 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 6ae8f380fe28..6ae8f380fe28 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 424bbe171779..424bbe171779 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/qtbitcointrader/default.nix b/nixpkgs/pkgs/applications/misc/qtbitcointrader/default.nix
index 7586669218da..7586669218da 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 15cd426f1b3f..15cd426f1b3f 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 b2616bf7b778..b2616bf7b778 100644
--- a/pkgs/applications/misc/quicksynergy/default.nix
+++ b/nixpkgs/pkgs/applications/misc/quicksynergy/default.nix
diff --git a/pkgs/applications/misc/ranger/default.nix b/nixpkgs/pkgs/applications/misc/ranger/default.nix
index 7045228d6a2f..7045228d6a2f 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 bf4559e91178..bf4559e91178 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 03b8d709fce2..03b8d709fce2 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 d731d8ec43ad..d731d8ec43ad 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 d8512754f6a7..d8512754f6a7 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 703d78621249..703d78621249 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 b934788cdbeb..b934788cdbeb 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 be365cb94e4e..be365cb94e4e 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 76593eba5fc4..76593eba5fc4 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 2255089ab7e2..2255089ab7e2 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 94381d4f6f96..94381d4f6f96 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 8c24d27f0752..8c24d27f0752 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 11a75e4064f4..11a75e4064f4 100644
--- a/pkgs/applications/misc/roxterm/default.nix
+++ b/nixpkgs/pkgs/applications/misc/roxterm/default.nix
diff --git a/pkgs/applications/misc/rsibreak/default.nix b/nixpkgs/pkgs/applications/misc/rsibreak/default.nix
index 6ee9966401b5..6ee9966401b5 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 20211ecb53b1..20211ecb53b1 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 8e63cdb6d16c..8e63cdb6d16c 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 f872e8008363..f872e8008363 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-font-size/default.nix b/nixpkgs/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-font-size/default.nix
index 4f4319af6cbd..4f4319af6cbd 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 13e005014f10..13e005014f10 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 544789e865b5..544789e865b5 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 e8e5c524a35c..e8e5c524a35c 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 ba8ec3a6e72a..ba8ec3a6e72a 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 2f2c20558031..2f2c20558031 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 d198c5951359..d198c5951359 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 c8d2acfbdc51..c8d2acfbdc51 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 636083218fa5..636083218fa5 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 5e42e17c156a..5e42e17c156a 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 fd0860b3aaef..fd0860b3aaef 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 de1e7a093d5a..de1e7a093d5a 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 33df8e8f0a27..33df8e8f0a27 100644
--- a/pkgs/applications/misc/sakura/default.nix
+++ b/nixpkgs/pkgs/applications/misc/sakura/default.nix
diff --git a/pkgs/applications/misc/sbagen/default.nix b/nixpkgs/pkgs/applications/misc/sbagen/default.nix
index 6f38ba5662b5..6f38ba5662b5 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 280a42fde14c..280a42fde14c 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 cc8c30043b29..cc8c30043b29 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 9bbae33b3e41..9bbae33b3e41 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 4947bcf60bd9..4947bcf60bd9 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 fc63745ebb84..fc63745ebb84 100644
--- a/pkgs/applications/misc/sequelpro/default.nix
+++ b/nixpkgs/pkgs/applications/misc/sequelpro/default.nix
diff --git a/pkgs/applications/misc/sigal/default.nix b/nixpkgs/pkgs/applications/misc/sigal/default.nix
index 2b44b0398b55..2b44b0398b55 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 719b8d32b330..719b8d32b330 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 fc6be074a079..fc6be074a079 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 9ee30d347b0a..9ee30d347b0a 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 cf5c4625c952..cf5c4625c952 100644
--- a/pkgs/applications/misc/sleepyhead/default.nix
+++ b/nixpkgs/pkgs/applications/misc/sleepyhead/default.nix
diff --git a/pkgs/applications/misc/slic3r/default.nix b/nixpkgs/pkgs/applications/misc/slic3r/default.nix
index e012c3763b34..e012c3763b34 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 193bcf205f5b..193bcf205f5b 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 f4a2e889cd43..f4a2e889cd43 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 cb2cd3f1e62f..cb2cd3f1e62f 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 9f20b20f7f3a..9f20b20f7f3a 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 180b66fda8ce..180b66fda8ce 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 a1d5ef153bbd..a1d5ef153bbd 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 aee486ddf0c2..aee486ddf0c2 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 47d7279a47fa..47d7279a47fa 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 b63a41bb9156..b63a41bb9156 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 ebb50e685da7..ebb50e685da7 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 d3cd81f7f13a..d3cd81f7f13a 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 a2407d3079f5..a2407d3079f5 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 8f26ee99e227..8f26ee99e227 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 1fc96e551ac7..1fc96e551ac7 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 d545447cb130..d545447cb130 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 50bb1df2eef2..50bb1df2eef2 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 8102375479be..8102375479be 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 293f6aaa3c6f..293f6aaa3c6f 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 eef5185aaeed..eef5185aaeed 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 3e7983c667f2..3e7983c667f2 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 f16a0d29c40d..f16a0d29c40d 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 1103146ed1b7..1103146ed1b7 100644
--- a/pkgs/applications/misc/syncthing-tray/deps.nix
+++ b/nixpkgs/pkgs/applications/misc/syncthing-tray/deps.nix
diff --git a/pkgs/applications/misc/synergy/default.nix b/nixpkgs/pkgs/applications/misc/synergy/default.nix
index 25855c2a6130..25855c2a6130 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 56dc6112844e..56dc6112844e 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 003d7d22421a..003d7d22421a 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 87b53e78585b..87b53e78585b 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 52e39b98a3b6..52e39b98a3b6 100644
--- a/pkgs/applications/misc/tabula/default.nix
+++ b/nixpkgs/pkgs/applications/misc/tabula/default.nix
diff --git a/pkgs/applications/misc/tangogps/default.nix b/nixpkgs/pkgs/applications/misc/tangogps/default.nix
index 08bea18d8e9a..08bea18d8e9a 100644
--- a/pkgs/applications/misc/tangogps/default.nix
+++ b/nixpkgs/pkgs/applications/misc/tangogps/default.nix
diff --git a/pkgs/applications/misc/taskell/default.nix b/nixpkgs/pkgs/applications/misc/taskell/default.nix
index 1a1ea3102afd..1a1ea3102afd 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 6b38c3d59c29..6b38c3d59c29 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 f599e8a1730c..f599e8a1730c 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 77cbaeeed793..77cbaeeed793 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 d1642e76fa65..d1642e76fa65 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 23252d0c4807..23252d0c4807 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 e65ab3451a62..e65ab3451a62 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 ab9f5a354646..ab9f5a354646 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 dcc46e370e71..dcc46e370e71 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 1b3bacf71df8..1b3bacf71df8 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 fcf607de8157..fcf607de8157 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 7ca421b49a35..7ca421b49a35 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 9f1773b191d2..9f1773b191d2 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 6a30adb23da2..6a30adb23da2 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 8e5c0139e555..8e5c0139e555 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 dc632f3ed757..dc632f3ed757 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 15ee275c0e19..15ee275c0e19 100644
--- a/pkgs/applications/misc/tdrop/default.nix
+++ b/nixpkgs/pkgs/applications/misc/tdrop/default.nix
diff --git a/pkgs/applications/misc/termdown/default.nix b/nixpkgs/pkgs/applications/misc/termdown/default.nix
index dc23443489ff..dc23443489ff 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 3599bd0030b9..3599bd0030b9 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 bdbea571790e..bdbea571790e 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 80dffe6d93f2..80dffe6d93f2 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 c12a4c9f8da6..c12a4c9f8da6 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 81283f86a21d..81283f86a21d 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 d4191a875bdd..d4191a875bdd 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 f8c68518bb4d..f8c68518bb4d 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 96deaa073d71..96deaa073d71 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 379223d9076d..379223d9076d 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 4388cbcfb441..4388cbcfb441 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 9502b3a0abe7..9502b3a0abe7 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 c057fde95d7f..c057fde95d7f 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 4172660182df..4172660182df 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 342eca0a6fdc..342eca0a6fdc 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 ca049ba04c91..ca049ba04c91 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 c70503cbff2f..c70503cbff2f 100644
--- a/pkgs/applications/misc/tint2/default.nix
+++ b/nixpkgs/pkgs/applications/misc/tint2/default.nix
diff --git a/pkgs/applications/misc/tmatrix/default.nix b/nixpkgs/pkgs/applications/misc/tmatrix/default.nix
index 3ef0eac2417a..3ef0eac2417a 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 6cf1f27a104b..6cf1f27a104b 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 5bb2b5b94616..5bb2b5b94616 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 d4735c0baf5f..d4735c0baf5f 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 122567de2e1e..122567de2e1e 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 e86156313d1f..e86156313d1f 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 b268bdd0962e..b268bdd0962e 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 c8303440fe67..c8303440fe67 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 ba6e97d61fb3..ba6e97d61fb3 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 6079c8807dc1..6079c8807dc1 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 413f082fb22a..413f082fb22a 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 34952b9c0f4d..34952b9c0f4d 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 09322b47506b..09322b47506b 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 9fb8469cf27a..9fb8469cf27a 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 dbac56abaa1d..dbac56abaa1d 100644
--- a/pkgs/applications/misc/tthsum/default.nix
+++ b/nixpkgs/pkgs/applications/misc/tthsum/default.nix
diff --git a/pkgs/applications/misc/tvbrowser/bin.nix b/nixpkgs/pkgs/applications/misc/tvbrowser/bin.nix
index 38865ca4f3d9..38865ca4f3d9 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 04c6cc3606e3..04c6cc3606e3 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 c887876634f5..c887876634f5 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 3cc4fcc1517b..3cc4fcc1517b 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 554682108e39..554682108e39 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 459104aba638..459104aba638 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 12cf96580f74..12cf96580f74 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 2936df65194e..2936df65194e 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 87800cf90d6d..87800cf90d6d 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 8764c41c8a4c..8764c41c8a4c 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 d12120ca2f11..d12120ca2f11 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 6752b0182fea..6752b0182fea 100644
--- a/pkgs/applications/misc/valentina/default.nix
+++ b/nixpkgs/pkgs/applications/misc/valentina/default.nix
diff --git a/pkgs/applications/misc/vcal/default.nix b/nixpkgs/pkgs/applications/misc/vcal/default.nix
index 5cd8de43729b..5cd8de43729b 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 8b64bcca667d..8b64bcca667d 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 f23862c63cd4..f23862c63cd4 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 9696ebac98bc..9696ebac98bc 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 50f2012d34ab..50f2012d34ab 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 5ebc98b57123..5ebc98b57123 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 3eb797f182e7..3eb797f182e7 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 166811fb4ae3..166811fb4ae3 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 e794b82e2f6e..e794b82e2f6e 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 1feec9e45509..1feec9e45509 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 48818ca3b8b1..48818ca3b8b1 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 0be04c895e35..0be04c895e35 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 1c6dc8f63c23..1c6dc8f63c23 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 90fa01661543..90fa01661543 100644
--- a/pkgs/applications/misc/weather/default.nix
+++ b/nixpkgs/pkgs/applications/misc/weather/default.nix
diff --git a/pkgs/applications/misc/wego/default.nix b/nixpkgs/pkgs/applications/misc/wego/default.nix
index a3d3ace009e1..a3d3ace009e1 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 74ab69a30e14..74ab69a30e14 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 d8628b794d71..d8628b794d71 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 6a5f7c17b208..6a5f7c17b208 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 68f6c4df1593..68f6c4df1593 100644
--- a/pkgs/applications/misc/wmname/default.nix
+++ b/nixpkgs/pkgs/applications/misc/wmname/default.nix
diff --git a/pkgs/applications/misc/wordnet/default.nix b/nixpkgs/pkgs/applications/misc/wordnet/default.nix
index 5d153a0e417f..5d153a0e417f 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 69421e288d34..69421e288d34 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 1547d2962116..1547d2962116 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 13e4ed81a592..13e4ed81a592 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 987b676034f6..987b676034f6 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 bf3d9b737a9e..bf3d9b737a9e 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 280b30128727..280b30128727 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 a7a6500fd22a..a7a6500fd22a 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 8875c95fe578..8875c95fe578 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 ed7f2b27c381..ed7f2b27c381 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 444ab802673e..444ab802673e 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 5d2b70a80ee4..5d2b70a80ee4 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 88ab52313b06..88ab52313b06 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 3023e830dc79..3023e830dc79 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 3f3865d7688a..3f3865d7688a 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 4fa1c833df53..4fa1c833df53 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 fc5abf109894..fc5abf109894 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 f359a9c2ba46..f359a9c2ba46 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 fcd4ebfbeed2..fcd4ebfbeed2 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 9afe3cae07bf..9afe3cae07bf 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 4922d3c6aed1..4922d3c6aed1 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 c6438a21f2c3..c6438a21f2c3 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 5db4a2508399..5db4a2508399 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 59a51f7506d5..59a51f7506d5 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 eb76448391e3..eb76448391e3 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 cf6f5f32ee2a..cf6f5f32ee2a 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 606da76c7293..606da76c7293 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 598fc6dbd073..598fc6dbd073 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 bb3385ad016a..bb3385ad016a 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 fe65004b32ae..fe65004b32ae 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 28ce4a0d500d..28ce4a0d500d 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 ef9ce3393619..ef9ce3393619 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 3e8acff00f89..3e8acff00f89 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 6db6c14c26a7..6db6c14c26a7 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 6f67ed96c57f..6f67ed96c57f 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 ab33612ded97..ab33612ded97 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 480e67e89ca3..480e67e89ca3 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 21f95c65fa56..21f95c65fa56 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 56638d126c19..56638d126c19 100644
--- a/pkgs/applications/misc/xxkb/default.nix
+++ b/nixpkgs/pkgs/applications/misc/xxkb/default.nix
diff --git a/pkgs/applications/misc/yaft/default.nix b/nixpkgs/pkgs/applications/misc/yaft/default.nix
index d273d27944a8..d273d27944a8 100644
--- a/pkgs/applications/misc/yaft/default.nix
+++ b/nixpkgs/pkgs/applications/misc/yaft/default.nix
diff --git a/pkgs/applications/misc/yakuake/default.nix b/nixpkgs/pkgs/applications/misc/yakuake/default.nix
index 8f8494ac45b5..8f8494ac45b5 100644
--- a/pkgs/applications/misc/yakuake/default.nix
+++ b/nixpkgs/pkgs/applications/misc/yakuake/default.nix
diff --git a/pkgs/applications/misc/yarssr/default.nix b/nixpkgs/pkgs/applications/misc/yarssr/default.nix
index a47fb93512db..a47fb93512db 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 53d427e61c2c..53d427e61c2c 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 6b3a4f747f47..6b3a4f747f47 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 3d4718990cb8..3d4718990cb8 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 eb2a0f1c1e14..eb2a0f1c1e14 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 af72e0a8d9ad..af72e0a8d9ad 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 e3db15ca78d4..e3db15ca78d4 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 54f68969d4f7..54f68969d4f7 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 f3cacd21236e..f3cacd21236e 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 98cfb4c6687a..98cfb4c6687a 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 48d42b5e9399..48d42b5e9399 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 3059c3f725b1..3059c3f725b1 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 ec8deadf9f54..ec8deadf9f54 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/default.nix b/nixpkgs/pkgs/applications/misc/zola/default.nix
index 48f5b216ea1b..48f5b216ea1b 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 18876cf355b8..18876cf355b8 100644
--- a/pkgs/applications/misc/zscroll/default.nix
+++ b/nixpkgs/pkgs/applications/misc/zscroll/default.nix
diff --git a/pkgs/applications/networking/Sylk/default.nix b/nixpkgs/pkgs/applications/networking/Sylk/default.nix
index 36f6279c2092..36f6279c2092 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 05dee5b6154c..05dee5b6154c 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 8b7bc0bb899a..8b7bc0bb899a 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 32de4871186f..32de4871186f 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 4a6af3f96b44..4a6af3f96b44 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 0797eea6f3b5..0797eea6f3b5 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 fae04b4d6a58..fae04b4d6a58 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 e7bec997119e..e7bec997119e 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 8bdb33ed5d22..8bdb33ed5d22 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 ea0e01843404..ea0e01843404 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 3178e2595fc5..3178e2595fc5 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/chromium-vaapi.patch b/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/chromium-vaapi.patch
index 38d77e215516..38d77e215516 100644
--- a/pkgs/applications/networking/browsers/chromium/patches/chromium-vaapi.patch
+++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/chromium-vaapi.patch
diff --git a/pkgs/applications/networking/browsers/chromium/patches/jumbo-sorted.patch b/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/jumbo-sorted.patch
index cdf0f695f761..cdf0f695f761 100644
--- a/pkgs/applications/networking/browsers/chromium/patches/jumbo-sorted.patch
+++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/jumbo-sorted.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 da6a4c92b460..e7aa4f1ea0ac 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
@@ -27,8 +27,8 @@ index f4e119d..d9775bd 100644
 +  const char* value = getenv(full_env.c_str());
 +  if (value == NULL)
 +      return base::PathService::Get(base::DIR_MODULE, result);
-+  else
-+      *result = base::FilePath(value);
++  *result = base::FilePath(value);
++  return true;
  }
  
  // Gets the path for bundled implementations of components. Note that these
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 6b788f43d29c..6b788f43d29c 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 07572cf7ee94..07572cf7ee94 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/widevine.patch b/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/widevine.patch
index 90a13928e3bd..90a13928e3bd 100644
--- a/pkgs/applications/networking/browsers/chromium/patches/widevine.patch
+++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/widevine.patch
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix
index eca2bc0d99f7..eca2bc0d99f7 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 2334dc6a71e4..2334dc6a71e4 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 ea67a62c107a..ea67a62c107a 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 89d969587a1c..89d969587a1c 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 be1389c2121f..be1389c2121f 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 671ab03a2e29..671ab03a2e29 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 b60454c4a42d..b60454c4a42d 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 de06f563d6e6..de06f563d6e6 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 e067f3f15eb5..e067f3f15eb5 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 26b3c3ace8bf..26b3c3ace8bf 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 c721a61591a1..c721a61591a1 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 78a6a52e20fb..78a6a52e20fb 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 c52bf0ba95e1..c52bf0ba95e1 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 d9b96fb7e634..d9b96fb7e634 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 857604f4aa0a..857604f4aa0a 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 d6593be8890c..d6593be8890c 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 29b12c9fec09..455ed10b214b 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix
@@ -22,8 +22,8 @@
 , pulseaudioSupport ? stdenv.isLinux, libpulseaudio
 , ffmpegSupport ? true
 , gtk3Support ? true, gtk2, gtk3, wrapGAppsHook
-, waylandSupport ? true, libxkbcommon
 , gssSupport ? true, kerberos
+, waylandSupport ? gtk3Support, libxkbcommon
 
 ## privacy-related options
 
@@ -149,6 +149,7 @@ stdenv.mkDerivation rec {
   ++ lib.optional  alsaSupport alsaLib
   ++ lib.optional  pulseaudioSupport libpulseaudio # only headers are needed
   ++ lib.optional  gtk3Support gtk3
+  ++ lib.optional  waylandSupport libxkbcommon
   ++ lib.optional  gssSupport kerberos
   ++ lib.optional  waylandSupport libxkbcommon
   ++ lib.optionals stdenv.isDarwin [ CoreMedia ExceptionHandling Kerberos
@@ -277,7 +278,7 @@ stdenv.mkDerivation rec {
   ++ flag gssSupport "negotiateauth"
   ++ flag webrtcSupport "webrtc"
   ++ flag crashreporterSupport "crashreporter"
-  ++ lib.optional drmSupport "--enable-eme=widevine"
+  ++ lib.optional (!drmSupport) "--disable-eme"
 
   ++ lib.optionals (lib.versionOlder ffversion "60") ([]
     ++ flag geolocationSupport "mozril-geoloc"
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 18d31356989a..18d31356989a 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 1c3c32948944..1c3c32948944 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 7d129dc78f98..7d129dc78f98 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-max-64.patch
index de278152f978..de278152f978 100644
--- a/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch
+++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/no-buildconfig-max-64.patch
diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/no-buildconfig-min-65.patch b/nixpkgs/pkgs/applications/networking/browsers/firefox/no-buildconfig-min-65.patch
new file mode 100644
index 000000000000..708004781efc
--- /dev/null
+++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/no-buildconfig-min-65.patch
@@ -0,0 +1,25 @@
+diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp
+index fe0a5af..3df1e0e 100644
+--- a/docshell/base/nsAboutRedirector.cpp
++++ b/docshell/base/nsAboutRedirector.cpp
+@@ -67,8 +67,6 @@ static const RedirEntry kRedirMap[] = {
+     {"about", "chrome://global/content/aboutAbout.xhtml", 0},
+     {"addons", "chrome://mozapps/content/extensions/extensions.xul",
+      nsIAboutModule::ALLOW_SCRIPT},
+-    {"buildconfig", "chrome://global/content/buildconfig.html",
+-     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT},
+     {"checkerboard", "chrome://global/content/aboutCheckerboard.xhtml",
+      nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
+          nsIAboutModule::ALLOW_SCRIPT},
+diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
+index 2ec137d..579ef4d 100644
+--- a/toolkit/content/jar.mn
++++ b/toolkit/content/jar.mn
+@@ -36,7 +36,6 @@ toolkit.jar:
+    content/global/plugins.css
+    content/global/browser-child.js
+    content/global/browser-content.js
+-*   content/global/buildconfig.html
+    content/global/buildconfig.css
+    content/global/contentAreaUtils.js
+    content/global/datepicker.xhtml
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
index 93449288075b..b6a503461bfa 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -1,9 +1,9 @@
-{ lib, callPackage, fetchurl, fetchFromGitHub, python3, overrideCC, gccStdenv, gcc6 }:
+{ lib, callPackage, fetchurl, fetchFromGitHub, firefoxCommon, python3
+, overrideCC, gccStdenv, gcc6
+}:
 
 let
 
-  common = opts: callPackage (import ./common.nix opts) {};
-
   # Needed on older branches since rustc: 1.32.0 -> 1.33.0
   missing-documentation-patch = fetchurl {
     name = "missing-documentation.patch";
@@ -15,7 +15,7 @@ in
 
 rec {
 
-  firefox = common rec {
+  firefox = firefoxCommon rec {
     pname = "firefox";
     ffversion = "67.0.4";
     src = fetchurl {
@@ -47,7 +47,7 @@ rec {
   # the web, there are many old useful plugins targeting offline
   # activities (e.g. ebook readers, syncronous translation, etc) that
   # will probably never be ported to WebExtensions API.
-  firefox-esr-52 = (common rec {
+  firefox-esr-52 = (firefoxCommon rec {
     pname = "firefox-esr";
     ffversion = "52.9.0esr";
     src = fetchurl {
@@ -70,7 +70,7 @@ rec {
     gtk3Support = false;
   };
 
-  firefox-esr-60 = common rec {
+  firefox-esr-60 = firefoxCommon rec {
     pname = "firefox-esr";
     ffversion = "60.7.2esr";
     src = fetchurl {
@@ -98,9 +98,32 @@ rec {
     };
   };
 
+  firefox-beta = firefoxCommon rec {
+    pname = "firefox";
+    ffversion = "66.0b5";
+    src = fetchurl {
+      url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
+      sha512 = "2cnv8pnl220dxqfpcdnwibwidc8b9zg3bj9wkzc83r4cdsfcjy3hqyw01gpc30a4qwbbabsgask3hl3dg7d3d8qqw4c588b00z67mvs";
+    };
+
+    patches = [
+      ./no-buildconfig-ffx65.patch
+    ];
+
+    extraNativeBuildInputs = [ python3 ];
+
+    meta = firefox.meta // {
+      description = "A web browser built from Firefox Beta source tree";
+    };
+    updateScript = callPackage ./update.nix {
+      attrPath = "firefox-beta";
+      versionKey = "ffversion";
+    };
+  };
+
 } // (let
 
-  iccommon = args: common (args // {
+  iccommon = args: firefoxCommon (args // {
     pname = "icecat";
     isIceCatLike = true;
 
@@ -176,7 +199,7 @@ in rec {
 
 }) // (let
 
-  tbcommon = args: common (args // {
+  tbcommon = args: firefoxCommon (args // {
     pname = "tor-browser";
     isTorBrowserLike = true;
 
diff --git a/pkgs/applications/networking/browsers/firefox/update.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/update.nix
index e12b552535d2..e12b552535d2 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 bc1678335947..bc1678335947 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 b0ae61c761df..b0ae61c761df 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 59ba69c1c4da..59ba69c1c4da 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 69beeb167590..69beeb167590 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 d6b775107d06..d6b775107d06 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 fd21d9222d3d..fd21d9222d3d 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 fa98f2a9e785..fa98f2a9e785 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/esteidfirefoxplugin/default.nix b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix
index 48d06d644dda..48d06d644dda 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/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 b4d0b91deac6..b4d0b91deac6 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 585c0be26d1d..585c0be26d1d 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 fb36125b3a17..fb36125b3a17 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 30bae8792c2e..30bae8792c2e 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 b7d05ddd0ef5..b7d05ddd0ef5 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 1128381238b4..1128381238b4 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 dcac4f17928b..dcac4f17928b 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 71b5161c1e39..71b5161c1e39 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 1e2c31d9527a..1e2c31d9527a 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 c6c1d6a334cd..c6c1d6a334cd 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 a5bfda9f26c9..a5bfda9f26c9 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 fa455eb0b7a4..fa455eb0b7a4 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 62831613a2e2..62831613a2e2 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/opera/default.nix b/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix
index 732e020604a8..732e020604a8 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 b7118b49dae6..b7118b49dae6 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 0d863ae91314..0d863ae91314 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 df956addf5cc..df956addf5cc 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 03a5aa7bfe21..03a5aa7bfe21 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 56f6bcebf280..56f6bcebf280 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 3a7612bb0fbc..3a7612bb0fbc 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 4eeb65826721..4eeb65826721 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/default.nix b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
index dbe4ddca10f4..dbe4ddca10f4 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle/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 bddac77d1d69..bddac77d1d69 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/uzbl/default.nix b/nixpkgs/pkgs/applications/networking/browsers/uzbl/default.nix
index 1d08895f1b01..1d08895f1b01 100644
--- a/pkgs/applications/networking/browsers/uzbl/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/uzbl/default.nix
diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/nixpkgs/pkgs/applications/networking/browsers/vimb/default.nix
index cc9bc38bc4db..cc9bc38bc4db 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/vimprobable2/default.nix b/nixpkgs/pkgs/applications/networking/browsers/vimprobable2/default.nix
index 678f226816a8..678f226816a8 100644
--- a/pkgs/applications/networking/browsers/vimprobable2/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/vimprobable2/default.nix
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix
index ee477af8d492..ee477af8d492 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 3207409a6ba5..3207409a6ba5 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 2e6c2853eb14..2e6c2853eb14 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 a21de1acad28..a21de1acad28 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 49dd417d1c39..49dd417d1c39 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 136c14d34d48..136c14d34d48 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 0816c022926d..0816c022926d 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/c14/default.nix b/nixpkgs/pkgs/applications/networking/c14/default.nix
index 242abc2ece79..242abc2ece79 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 fe51488c7066..fe51488c7066 100644
--- a/pkgs/applications/networking/c14/deps.nix
+++ b/nixpkgs/pkgs/applications/networking/c14/deps.nix
diff --git a/pkgs/applications/networking/charles/default.nix b/nixpkgs/pkgs/applications/networking/charles/default.nix
index 3946bf886250..3946bf886250 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 fd047147e01a..fd047147e01a 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 da7f509378dd..da7f509378dd 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 647261a138f2..647261a138f2 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 ace7ecd21b33..ace7ecd21b33 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/chronos/chronos-deps.nix b/nixpkgs/pkgs/applications/networking/cluster/chronos/chronos-deps.nix
index aac0dd10e15a..aac0dd10e15a 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 bc9023a222f6..bc9023a222f6 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 2e337076107d..2e337076107d 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 cb7c41d0c8a1..cb7c41d0c8a1 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/click/fix_cargo_lock_version.patch b/nixpkgs/pkgs/applications/networking/cluster/click/fix_cargo_lock_version.patch
index bc4db7ef7c12..bc4db7ef7c12 100644
--- a/pkgs/applications/networking/cluster/click/fix_cargo_lock_version.patch
+++ b/nixpkgs/pkgs/applications/networking/cluster/click/fix_cargo_lock_version.patch
diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/nixpkgs/pkgs/applications/networking/cluster/cni/default.nix
index 88dbd177da04..88dbd177da04 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.nix b/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix
index fb36d3729c05..fb36d3729c05 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 876630c559a5..876630c559a5 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 e321b2c1b0ac..e321b2c1b0ac 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 181663513d3e..181663513d3e 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 d8fa1a04507a..d8fa1a04507a 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-deps.nix b/nixpkgs/pkgs/applications/networking/cluster/docker-machine/xhyve-deps.nix
index 99cb7b98f5cc..99cb7b98f5cc 100644
--- a/pkgs/applications/networking/cluster/docker-machine/xhyve-deps.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/docker-machine/xhyve-deps.nix
diff --git a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix b/nixpkgs/pkgs/applications/networking/cluster/docker-machine/xhyve.nix
index 6b0440eb84ae..6b0440eb84ae 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 e5f437a89ad9..e5f437a89ad9 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/habitat/default.nix b/nixpkgs/pkgs/applications/networking/cluster/habitat/default.nix
index 0c210dcc535b..0c210dcc535b 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 42c043d0007f..42c043d0007f 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 c03af2e9683d..c03af2e9683d 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/helm/deps.nix b/nixpkgs/pkgs/applications/networking/cluster/helm/deps.nix
index 36bd3406f5bf..36bd3406f5bf 100644
--- a/pkgs/applications/networking/cluster/helm/deps.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/helm/deps.nix
diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix
index 1faa0988a66d..1faa0988a66d 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 cd0ef728f83e..cd0ef728f83e 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 5eaf1d13d618..5eaf1d13d618 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 223d6c6c2477..223d6c6c2477 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 88aa8777ee5e..88aa8777ee5e 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/kanif/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kanif/default.nix
index 6274168b3da7..6274168b3da7 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 19194c2d0873..19194c2d0873 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 1e03efddc062..1e03efddc062 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 f0a52f5266ef..f0a52f5266ef 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 96f3354023cf..96f3354023cf 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 a3cb55ce329c..a3cb55ce329c 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 bc01055244c8..bc01055244c8 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/kube3d/deps.nix b/nixpkgs/pkgs/applications/networking/cluster/kube3d/deps.nix
index 4fb2936a40b0..4fb2936a40b0 100644
--- a/pkgs/applications/networking/cluster/kube3d/deps.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/kube3d/deps.nix
diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix
index cf0116ba8569..cf0116ba8569 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 40d42408679e..40d42408679e 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/kubernetes/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix
index 190711e3096b..190711e3096b 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/kubetail/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubetail/default.nix
index d1e24c56f8ad..d1e24c56f8ad 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 55a827f9cf92..55a827f9cf92 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/kubeval/deps.nix b/nixpkgs/pkgs/applications/networking/cluster/kubeval/deps.nix
index b9565e927ded..b9565e927ded 100644
--- a/pkgs/applications/networking/cluster/kubeval/deps.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/kubeval/deps.nix
diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/nixpkgs/pkgs/applications/networking/cluster/luigi/default.nix
index aad752643645..aad752643645 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 49cac6d50635..49cac6d50635 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 8cff2494bf8f..8cff2494bf8f 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 cf7318ecb273..cf7318ecb273 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 1cf819870f4e..1cf819870f4e 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 a6fea024b087..a6fea024b087 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 bee578cc3e93..bee578cc3e93 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 5b5d6a98e889..5b5d6a98e889 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 5551f635bc36..5551f635bc36 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 63a127def7f5..63a127def7f5 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 dd57add14af9..dd57add14af9 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 618bea36de86..618bea36de86 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 26c39f8cbe21..26c39f8cbe21 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/spark/default.nix b/nixpkgs/pkgs/applications/networking/cluster/spark/default.nix
index 3572bfe7f5ba..3572bfe7f5ba 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 052797db2f3f..052797db2f3f 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 bb0f3229ea5e..bb0f3229ea5e 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 fff5cf8c0de4..fff5cf8c0de4 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 c61896d89218..c61896d89218 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 2b39cebbbeb0..2b39cebbbeb0 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 dd4a36807ea1..dd4a36807ea1 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 9f7b5e317fe3..9f7b5e317fe3 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 c4f9a5511de9..c4f9a5511de9 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 b801fad546df..b801fad546df 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 1380005a1c15..1380005a1c15 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 aa3f5142aa5e..aa3f5142aa5e 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/data.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/data.nix
index b0a1d91ce6e0..b0a1d91ce6e0 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 c542de912f34..c542de912f34 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 ae456185a80d..ae456185a80d 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 291698f3065f..291698f3065f 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 3d4a3547502d..3d4a3547502d 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 fddf13795f3e..fddf13795f3e 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 96b5c8a0fa1f..96b5c8a0fa1f 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 c5d6fda16514..c5d6fda16514 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 2009d474db7b..2009d474db7b 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 34d4858bf4fa..34d4858bf4fa 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 39a69e4a389f..39a69e4a389f 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 56c30df37c5b..56c30df37c5b 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 8432a8366b7a..8432a8366b7a 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 86496d18e2e6..86496d18e2e6 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 5d9a658972c3..5d9a658972c3 100644
--- a/pkgs/applications/networking/compactor/default.nix
+++ b/nixpkgs/pkgs/applications/networking/compactor/default.nix
diff --git a/pkgs/applications/networking/corebird/default.nix b/nixpkgs/pkgs/applications/networking/corebird/default.nix
index 1ee2c694e0b4..1ee2c694e0b4 100644
--- a/pkgs/applications/networking/corebird/default.nix
+++ b/nixpkgs/pkgs/applications/networking/corebird/default.nix
diff --git a/pkgs/applications/networking/davmail/default.nix b/nixpkgs/pkgs/applications/networking/davmail/default.nix
index 589cd04057ee..589cd04057ee 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 34ebc84cea28..34ebc84cea28 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 ca132288bd69..ca132288bd69 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 62fe4e2e662e..62fe4e2e662e 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 2b6645b2c8a6..2b6645b2c8a6 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 d820d40f7a34..d820d40f7a34 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 84cd8014e1e6..84cd8014e1e6 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/dyndns/cfdyndns/default.nix b/nixpkgs/pkgs/applications/networking/dyndns/cfdyndns/default.nix
index a5b4c577b4cb..a5b4c577b4cb 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 bb3ab98d1a4c..bb3ab98d1a4c 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 f89b8206dbe6..f89b8206dbe6 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 708d3c1ed800..708d3c1ed800 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 e4df272a0c9a..e4df272a0c9a 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 36b4732ca2e7..36b4732ca2e7 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 e700c5634ad6..e700c5634ad6 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/feedreader/default.nix b/nixpkgs/pkgs/applications/networking/feedreaders/feedreader/default.nix
index 55932c5c1984..55932c5c1984 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 2795ac4e46e4..2795ac4e46e4 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 6bdaf2ffaf48..6bdaf2ffaf48 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 4d17cc8bddd1..4d17cc8bddd1 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 c1a9fddb3c21..c1a9fddb3c21 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 459aee01f43f..459aee01f43f 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 335f393bc077..335f393bc077 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 bb245928f07c..bb245928f07c 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 bc0a519a0eee..bc0a519a0eee 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 63c18d6e0929..63c18d6e0929 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 1833e641a075..1833e641a075 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 6bac5bd58362..6bac5bd58362 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 25ec5d29613a..25ec5d29613a 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 d5ef1d7beaab..d5ef1d7beaab 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 fdd8e004c8b2..fdd8e004c8b2 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 a3b2bbe90c19..a3b2bbe90c19 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 de624d7f6b29..de624d7f6b29 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 f681f3fa63b6..f681f3fa63b6 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 15e0b5a07b43..15e0b5a07b43 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 9057fda2e600..9057fda2e600 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 d36533fc9e5e..d36533fc9e5e 100644
--- a/pkgs/applications/networking/gopher/gopherclient/default.nix
+++ b/nixpkgs/pkgs/applications/networking/gopher/gopherclient/default.nix
diff --git a/pkgs/applications/networking/ids/bro/default.nix b/nixpkgs/pkgs/applications/networking/ids/bro/default.nix
index f90457ba9379..f90457ba9379 100644
--- a/pkgs/applications/networking/ids/bro/default.nix
+++ b/nixpkgs/pkgs/applications/networking/ids/bro/default.nix
diff --git a/pkgs/applications/networking/ids/daq/default.nix b/nixpkgs/pkgs/applications/networking/ids/daq/default.nix
index 9af105ad52eb..9af105ad52eb 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 0fdfbacb45cf..0fdfbacb45cf 100644
--- a/pkgs/applications/networking/ids/snort/default.nix
+++ b/nixpkgs/pkgs/applications/networking/ids/snort/default.nix
diff --git a/pkgs/applications/networking/ike/default.nix b/nixpkgs/pkgs/applications/networking/ike/default.nix
index 7953f35507d1..7953f35507d1 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 163f0ba3f497..163f0ba3f497 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 6ff51445718b..6ff51445718b 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 75e1791644b8..75e1791644b8 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 e1e851b13bbd..e1e851b13bbd 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 d6c8fae2b585..d6c8fae2b585 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-steam/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
index a034827c4ed4..a034827c4ed4 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 aefde289db59..aefde289db59 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 4e05e7cae970..4e05e7cae970 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 bbdb2ae79f83..bbdb2ae79f83 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 0df8bc84ff30..0df8bc84ff30 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 a2ba2f09f764..a2ba2f09f764 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 350d09078c41..350d09078c41 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 becf828a8567..becf828a8567 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 e2e94db089da..e2e94db089da 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 7c2b312c4b34..7c2b312c4b34 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 63149d3d54b9..63149d3d54b9 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 c9dfc79d2672..c9dfc79d2672 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/ekiga/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/ekiga/default.nix
index 9886c2fa2ed9..9886c2fa2ed9 100644
--- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/ekiga/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix
index bb8b721a8ac0..bb8b721a8ac0 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 63624146aeb8..63624146aeb8 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 2c27853c9442..2c27853c9442 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 26dc45144d96..26dc45144d96 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 5b664415c1f8..5b664415c1f8 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 5e6e2f9b8d8d..5e6e2f9b8d8d 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 3e16a58f54bb..3e16a58f54bb 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 9e1b9fe9c39f..9e1b9fe9c39f 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 689445d7dcb8..689445d7dcb8 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 820a742245ed..820a742245ed 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 e477bdfe2fd4..e477bdfe2fd4 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 4282e99a712e..4282e99a712e 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/mattermost-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
index e8c28dc3e536..e8c28dc3e536 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 d86d62021fbd..d86d62021fbd 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 3ebd745e4f1a..3ebd745e4f1a 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 2e1f2fbd3820..2e1f2fbd3820 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/core/plugin/gtk/Gemfile b/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile
index efe602edc4f2..efe602edc4f2 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/image_file_cache/Gemfile b/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/image_file_cache/Gemfile
index f86005fef078..f86005fef078 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/image_file_cache/Gemfile
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/image_file_cache/Gemfile
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/photo_support/Gemfile b/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/photo_support/Gemfile
index ee2ecf52d42e..ee2ecf52d42e 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/photo_support/Gemfile
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/photo_support/Gemfile
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/uitranslator/Gemfile b/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/uitranslator/Gemfile
index 61424d395f9b..61424d395f9b 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/uitranslator/Gemfile
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/uitranslator/Gemfile
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/default.nix
index ea190db07a61..ea190db07a61 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 5f3ef945b3d4..5f3ef945b3d4 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 092f5f35cbf8..092f5f35cbf8 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/mm/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix
index a75835b3c7e9..a75835b3c7e9 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 9b1939f00516..9b1939f00516 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 64443461e375..64443461e375 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 60fd5af0a1ab..60fd5af0a1ab 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 452149443096..452149443096 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 9f5c246ede63..9f5c246ede63 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 59b1d463c9d2..59b1d463c9d2 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 18bf89a5f2ed..18bf89a5f2ed 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 7e86a390edcb..7e86a390edcb 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 ff065e7e2ce3..ff065e7e2ce3 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 f407ed6cabe3..f407ed6cabe3 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 f482e12a4bc9..f482e12a4bc9 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 ba1d64c8b925..ba1d64c8b925 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 cff1bcc56b92..cff1bcc56b92 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 61e8c2b58d9d..61e8c2b58d9d 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 bcfcbee85568..bcfcbee85568 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 0b2cba649207..0b2cba649207 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 8022d32a081a..8022d32a081a 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-vk-plugin/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix
index e54af933a081..e54af933a081 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 8990aeee8ec0..8990aeee8ec0 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 5b3e09440a63..5b3e09440a63 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 ddb9217d5e22..ddb9217d5e22 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 8527593c1a20..8527593c1a20 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 6d75ba40ce01..6d75ba40ce01 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 dfdc92cfd4b8..dfdc92cfd4b8 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 b0758777186a..b0758777186a 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 8b6863384b3f..8b6863384b3f 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 049d404a8d5f..049d404a8d5f 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 095f838fe981..095f838fe981 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 b5fa1ccc2f41..b5fa1ccc2f41 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 e7527bafcc65..e7527bafcc65 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 55850f0a89c2..55850f0a89c2 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 1273c7dd3c3d..1273c7dd3c3d 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 796ec6b0a615..796ec6b0a615 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 9ef4e7bebe54..9ef4e7bebe54 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 e1a2fb40c5ae..e1a2fb40c5ae 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 e895b3cc00d1..e895b3cc00d1 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/pybitmessage/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
index 3f6b23d70a05..3f6b23d70a05 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 4ab3c64d16d8..4ab3c64d16d8 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 1c58ae353bb3..1c58ae353bb3 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 a9ee4dd6aea2..a9ee4dd6aea2 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 eeab5e32c0f2..eeab5e32c0f2 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 047890a932ca..047890a932ca 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 b918144c7662..b918144c7662 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 1106aa86a0a8..1106aa86a0a8 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 efecebe169e9..efecebe169e9 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 4be8edaf9b85..4be8edaf9b85 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 0ff6f0a30d50..0ff6f0a30d50 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 add337d3f085..add337d3f085 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 a6aef5e6a2fb..a6aef5e6a2fb 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 168719bf0e4c..168719bf0e4c 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 842060935b04..842060935b04 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 0546d2dae472..0546d2dae472 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 7c348b88c8a0..7c348b88c8a0 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 b84807c69a04..b84807c69a04 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 d6dcd0ee2ef8..d6dcd0ee2ef8 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 61a581e834c1..61a581e834c1 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/yarn2nix.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/yarn2nix.nix
index 5dd79fdf1d86..5dd79fdf1d86 100644
--- a/pkgs/applications/networking/instant-messengers/riot/yarn2nix.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/yarn2nix.nix
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 13c7281aea7c..13c7281aea7c 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 1a6811182453..1a6811182453 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 54959383f08e..54959383f08e 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 3336c05aae74..3336c05aae74 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 e0cb977d5c2b..e0cb977d5c2b 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 1219440bf833..1219440bf833 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 cf6031aa05b5..cf6031aa05b5 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 8b8ce8fd7bbf..8b8ce8fd7bbf 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 3ac2b567a8cb..3ac2b567a8cb 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 7ef42f8ddfdf..7ef42f8ddfdf 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 79464f54232c..79464f54232c 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 76987d08ff4b..76987d08ff4b 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 6ce33d4f0471..6ce33d4f0471 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/spectral/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/spectral/default.nix
index 72069ec81c1a..72069ec81c1a 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 9df816dd8907..9df816dd8907 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 51e7f081d1e0..51e7f081d1e0 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 911e7570427f..911e7570427f 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 c63b05d7acb1..c63b05d7acb1 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/teamspeak/client.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index 7a50536cc0ff..7a50536cc0ff 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 fe1903af5880..fe1903af5880 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/cutegram/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
index 77a8d57f8b6f..77a8d57f8b6f 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix
index 49368da708e9..49368da708e9 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/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 3e5294815084..3e5294815084 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/telegram/tdesktop/generic.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
index df06dc49eef4..df06dc49eef4 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix
index c0b1de893c73..c0b1de893c73 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix
index 0efa7bee1d0b..0efa7bee1d0b 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/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 a0cc73da46d8..a0cc73da46d8 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 769e639314e0..769e639314e0 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 4607961cdf08..4607961cdf08 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 8c777cd3f7d6..8c777cd3f7d6 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 7d68f66afc79..7d68f66afc79 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 0bc9b3124ee9..0bc9b3124ee9 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 c6b930fc590f..c6b930fc590f 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 06bcd7a0400e..06bcd7a0400e 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 c4acb22c810c..c4acb22c810c 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 a3f32bc82956..a3f32bc82956 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/utox/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/utox/default.nix
index 349a1363259c..349a1363259c 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 109566b5d079..109566b5d079 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 a4bf26a0b1af..a4bf26a0b1af 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 b992263e215b..b992263e215b 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 9f704e52721d..9f704e52721d 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 f2ae27e2c7da..f2ae27e2c7da 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 980d21572cc0..980d21572cc0 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 caa41024fc61..caa41024fc61 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 1904b959c8e0..1904b959c8e0 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 e06320424938..e06320424938 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/insync/default.nix b/nixpkgs/pkgs/applications/networking/insync/default.nix
index 3719a69138c6..3719a69138c6 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 870e40d81282..870e40d81282 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 f070c5109376..f070c5109376 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 1ad1c383c8c6..1ad1c383c8c6 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 a933a7b5358b..a933a7b5358b 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 54943533b85f..54943533b85f 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 45835248d0d8..45835248d0d8 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 746d79805f5c..746d79805f5c 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 d1a0b2d4b029..d1a0b2d4b029 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 7c40a4e12a66..7c40a4e12a66 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 917de745d277..917de745d277 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 0b52515228b9..0b52515228b9 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 8c5d2ffa35ea..8c5d2ffa35ea 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 34c4fcf0c88c..34c4fcf0c88c 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 4807f3419d15..4807f3419d15 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/irssi/default.nix b/nixpkgs/pkgs/applications/networking/irc/irssi/default.nix
index 347b7b28ca93..347b7b28ca93 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 aefc48d4a3ee..aefc48d4a3ee 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/irssi/otr/default.nix b/nixpkgs/pkgs/applications/networking/irc/irssi/otr/default.nix
index add4fa632c91..add4fa632c91 100644
--- a/pkgs/applications/networking/irc/irssi/otr/default.nix
+++ b/nixpkgs/pkgs/applications/networking/irc/irssi/otr/default.nix
diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/nixpkgs/pkgs/applications/networking/irc/konversation/default.nix
index 27297b01dce1..27297b01dce1 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 bd38855109a1..bd38855109a1 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 6aacdde544bc..6aacdde544bc 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 acf030222a1b..acf030222a1b 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 cf72bef62b17..cf72bef62b17 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/weechat/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix
index 5ae96d03f7c6..d9a5ef6602df 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix
@@ -41,6 +41,9 @@ let
       cmakeFlags = with stdenv.lib; [
         "-DENABLE_MAN=ON"
         "-DENABLE_DOC=ON"
+
+        # This just means it's okay to use Python 3 if it's in the environment.
+        "-DENABLE_PYTHON3=ON"
       ]
         ++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib" "-DCMAKE_FIND_FRAMEWORK=LAST"]
         ++ map (p: "-D${p.cmakeFlag}=" + (if p.enabled then "ON" else "OFF")) plugins
diff --git a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/colorize_nicks/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/colorize_nicks/default.nix
new file mode 100644
index 000000000000..646d1fa48a15
--- /dev/null
+++ b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/colorize_nicks/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, lib, fetchurl }:
+
+stdenv.mkDerivation {
+  pname = "weechat-colorize_nicks";
+  version = "26";
+
+  src = fetchurl {
+    url = "https://github.com/weechat/scripts/raw/ffda2e03486d1e90983a35ee3505b84d10fd5244/python/colorize_nicks.py";
+    sha256 = "1ldk6q4yhwgf1b8iizr971vqd9af6cz7f3krd3xw99wd1kjqqbx5";
+  };
+
+  unpackPhase = ''
+    :
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share
+    cp $src $out/share/colorize_nicks.py
+  '';
+
+  passthru = {
+    scripts = [ "colorize_nicks.py" ];
+  };
+
+  meta = with lib; {
+    description = "Use the weechat nick colors in the chat area";
+    licenses = licenses.gpl2Plus;
+    maintainers = with maintainers; [ qyliss ];
+  };
+}
diff --git a/pkgs/applications/networking/irc/weechat/scripts/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix
index 439e0e116141..2016b912ab67 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/default.nix
+++ b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix
@@ -1,6 +1,10 @@
 { callPackage, luaPackages, pythonPackages }:
 
 {
+  colorize_nicks = callPackage ./colorize_nicks { };
+
+  go = callPackage ./go { };
+
   weechat-xmpp = callPackage ./weechat-xmpp {
     inherit (pythonPackages) pydns;
   };
@@ -14,4 +18,6 @@
   };
 
   weechat-autosort = callPackage ./weechat-autosort { };
+
+  zncplayback = callPackage ./zncplayback { };
 }
diff --git a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/go/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/go/default.nix
new file mode 100644
index 000000000000..5f0afbfdc6d9
--- /dev/null
+++ b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/go/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, lib, fetchurl }:
+
+stdenv.mkDerivation {
+  pname = "go.py";
+  version = "2.5";
+
+  src = fetchurl {
+    url = "https://github.com/weechat/scripts/raw/dc9e69f37fcdc51f0f5a8856ef977ee3d8d8e371/python/go.py";
+    sha256 = "0ajfv4sl66jq02zzmdas81rvnv2l6dl3ckb4xzkyb3kdm68w31rf";
+  };
+
+  unpackPhase = ''
+    :
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share
+    cp $src $out/share/go.py
+  '';
+
+  passthru = {
+    scripts = [ "go.py" ];
+  };
+
+  meta = with lib; {
+    description = "Quick jump to buffers";
+    licenses = licenses.gpl3;
+    maintainers = with maintainers; [ qyliss ];
+  };
+}
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 de7974d4cbe3..de7974d4cbe3 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 af2dd36b41c5..af2dd36b41c5 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 17e07f91c031..17e07f91c031 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 233fe418df3a..233fe418df3a 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 d9945c2993b7..d9945c2993b7 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-xmpp/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/default.nix
index dad5b9c5e02a..dad5b9c5e02a 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/default.nix
+++ b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/default.nix
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/libpath.patch b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/libpath.patch
index 372c83944a27..372c83944a27 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/libpath.patch
+++ b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/libpath.patch
diff --git a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/zncplayback/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/zncplayback/default.nix
new file mode 100644
index 000000000000..dcd74c0da0e8
--- /dev/null
+++ b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/zncplayback/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, lib, fetchurl }:
+
+stdenv.mkDerivation {
+  pname = "weechat-zncplayback";
+  version = "0.1.0";
+
+  src = fetchurl {
+    url = "https://github.com/weechat/scripts/raw/643afdd25d29c2614cd67deb2388683cc270d686/python/zncplayback.py";
+    sha256 = "1mz9pmnrqv2pjk4wz9yp1bic49m8qbf4nh7pg4j7vghmpq9srkd9";
+  };
+
+  unpackPhase = ''
+    :
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share
+    cp $src $out/share/zncplayback.py
+  '';
+
+  passthru = {
+    scripts = [ "zncplayback.py" ];
+  };
+
+  meta = with lib; {
+    description = "Add support for the ZNC Playback module";
+    licenses = licenses.gpl2Plus;
+    maintainers = with maintainers; [ qyliss ];
+  };
+}
diff --git a/pkgs/applications/networking/irc/weechat/wrapper.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/wrapper.nix
index 6dcd9a31e5e0..6dcd9a31e5e0 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 e5fa2feb2019..e5fa2feb2019 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 add52d85d8b4..add52d85d8b4 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 bfc854ef9e9c..bfc854ef9e9c 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 34f332b003cf..34f332b003cf 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 8967a5d824aa..8967a5d824aa 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 d3a3dd6e29af..d3a3dd6e29af 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 46224ede33d4..46224ede33d4 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 be010c471790..be010c471790 100644
--- a/pkgs/applications/networking/linssid/default.nix
+++ b/nixpkgs/pkgs/applications/networking/linssid/default.nix
diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix
index e5d8c728a196..e5d8c728a196 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/afew/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/afew/default.nix
index cd512e776130..cd512e776130 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 bb62014c77a4..bb62014c77a4 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 58797800deb0..58797800deb0 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 db3cd7782e8f..db3cd7782e8f 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 42f29574eef3..42f29574eef3 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 2ff4269c3329..2ff4269c3329 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/imapfilter.nix b/nixpkgs/pkgs/applications/networking/mailreaders/imapfilter.nix
index e5a919af2e6f..e5a919af2e6f 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 72b9ce09d76d..72b9ce09d76d 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 bc0918737dd5..bc0918737dd5 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 05e784856554..05e784856554 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 46b3bff4f7a9..46b3bff4f7a9 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 32455e1132fd..32455e1132fd 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 0f11d9a6df05..0f11d9a6df05 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 f00ec6e6566f..f00ec6e6566f 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/msgviewer/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/msgviewer/default.nix
index 88e573f6cf42..88e573f6cf42 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 f259fdebf228..f259fdebf228 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 f4b0846b98f0..f4b0846b98f0 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 3e235400498f..3e235400498f 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 126e2854574e..126e2854574e 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 e2b56f3b8afd..e2b56f3b8afd 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 9ddedac09747..9ddedac09747 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 e25dfe834f65..e25dfe834f65 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 410e5e10ceb6..410e5e10ceb6 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/nylas-mail-bin/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix
index 3d8673a87a1b..3d8673a87a1b 100644
--- a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix
diff --git a/pkgs/applications/networking/mailreaders/realpine/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/realpine/default.nix
index f53c5d61050a..f53c5d61050a 100644
--- a/pkgs/applications/networking/mailreaders/realpine/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/realpine/default.nix
diff --git a/pkgs/applications/networking/mailreaders/sup/.bundix/cache b/nixpkgs/pkgs/applications/networking/mailreaders/sup/.bundix/cache
index 5894e96022c8..5894e96022c8 100644
--- a/pkgs/applications/networking/mailreaders/sup/.bundix/cache
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/sup/.bundix/cache
diff --git a/pkgs/applications/networking/mailreaders/sup/Gemfile b/nixpkgs/pkgs/applications/networking/mailreaders/sup/Gemfile
index bc37456ae58e..bc37456ae58e 100644
--- a/pkgs/applications/networking/mailreaders/sup/Gemfile
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/sup/Gemfile
diff --git a/pkgs/applications/networking/mailreaders/sup/Gemfile.lock b/nixpkgs/pkgs/applications/networking/mailreaders/sup/Gemfile.lock
index bd0f051c104d..bd0f051c104d 100644
--- a/pkgs/applications/networking/mailreaders/sup/Gemfile.lock
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/sup/Gemfile.lock
diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/sup/default.nix
index f7b7d6e8c3d8..f7b7d6e8c3d8 100644
--- a/pkgs/applications/networking/mailreaders/sup/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/sup/default.nix
diff --git a/pkgs/applications/networking/mailreaders/sup/gemset.nix b/nixpkgs/pkgs/applications/networking/mailreaders/sup/gemset.nix
index 023374932cb2..023374932cb2 100644
--- a/pkgs/applications/networking/mailreaders/sup/gemset.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/sup/gemset.nix
diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/sylpheed/default.nix
index 70f74dff3097..70f74dff3097 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 088233644791..088233644791 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 2c31684c36ce..2c31684c36ce 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 36eb46e5ef72..36eb46e5ef72 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 65eba3a2fc28..65eba3a2fc28 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 2d96d0336132..2d96d0336132 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 d31f98ef4ba6..d31f98ef4ba6 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 60049cd64b90..60049cd64b90 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 1e1f0b4941fb..1e1f0b4941fb 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 38e4155a1137..38e4155a1137 100644
--- a/pkgs/applications/networking/msmtp/paths.patch
+++ b/nixpkgs/pkgs/applications/networking/msmtp/paths.patch
diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix
index 2d5f47ee9826..2d5f47ee9826 100644
--- a/pkgs/applications/networking/mullvad-vpn/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix
diff --git a/pkgs/applications/networking/mumble/default.nix b/nixpkgs/pkgs/applications/networking/mumble/default.nix
index 321493682302..321493682302 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 7c18a33193df..7c18a33193df 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 185672a21f8c..185672a21f8c 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 44355c2c181d..44355c2c181d 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 b89173820ee8..b89173820ee8 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 0cfcf6408ba9..0cfcf6408ba9 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 e88936dc072b..e88936dc072b 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 b0bc5edba844..b0bc5edba844 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 9f775f0db656..9f775f0db656 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/default.nix b/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix
index 7aa7d88149fe..7aa7d88149fe 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 2c16fabc5c41..2c16fabc5c41 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 8795f32e829d..8795f32e829d 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 d91bfbae501d..d91bfbae501d 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 1e127c1b1ec2..1e127c1b1ec2 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 962f10a99c01..962f10a99c01 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 5818f4e94c30..5818f4e94c30 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 9ed532acfe1a..9ed532acfe1a 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 8ced53c972b5..8ced53c972b5 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 f58f7e04e00b..f58f7e04e00b 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 db30da82bdb2..db30da82bdb2 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/firestr/default.nix b/nixpkgs/pkgs/applications/networking/p2p/firestr/default.nix
index 56eb9c354275..56eb9c354275 100644
--- a/pkgs/applications/networking/p2p/firestr/default.nix
+++ b/nixpkgs/pkgs/applications/networking/p2p/firestr/default.nix
diff --git a/pkgs/applications/networking/p2p/firestr/return.patch b/nixpkgs/pkgs/applications/networking/p2p/firestr/return.patch
index c3e469ae92b0..c3e469ae92b0 100644
--- a/pkgs/applications/networking/p2p/firestr/return.patch
+++ b/nixpkgs/pkgs/applications/networking/p2p/firestr/return.patch
diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/nixpkgs/pkgs/applications/networking/p2p/freenet/default.nix
index d674c70e4c2f..d674c70e4c2f 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 f3106265801f..f3106265801f 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 0449540eaff1..0449540eaff1 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 1d98bf776755..1d98bf776755 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 715d8e13ec30..715d8e13ec30 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 9428b2764585..9428b2764585 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 c66c3ca05a4e..c66c3ca05a4e 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/mldonkey/default.nix b/nixpkgs/pkgs/applications/networking/p2p/mldonkey/default.nix
index 629e748fcacf..629e748fcacf 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 7f229be1b543..7f229be1b543 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 46c482818f8b..46c482818f8b 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 9696c55bd865..9696c55bd865 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 2d523cc07dd9..2d523cc07dd9 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 104131e47752..104131e47752 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/synapse-bt/default.nix b/nixpkgs/pkgs/applications/networking/p2p/synapse-bt/default.nix
index f3c7f8ccf18a..f3c7f8ccf18a 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 7a5f389af248..7a5f389af248 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 999f80a7bbd0..999f80a7bbd0 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 d4823988526e..d4823988526e 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 fc803fa2745c..fc803fa2745c 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 7d2f34c591e9..7d2f34c591e9 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 b94864a0b40f..b94864a0b40f 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 29ec8158099c..29ec8158099c 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 cce44521a620..cce44521a620 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 8725d5263fe3..8725d5263fe3 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 88f07f0a8a50..88f07f0a8a50 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 d20b07a8d3b1..d20b07a8d3b1 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 1e067b3c3356..1e067b3c3356 100644
--- a/pkgs/applications/networking/pjsip/default.nix
+++ b/nixpkgs/pkgs/applications/networking/pjsip/default.nix
diff --git a/pkgs/applications/networking/protocol/default.nix b/nixpkgs/pkgs/applications/networking/protocol/default.nix
index 305aceec62b5..305aceec62b5 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 2870f3158fb6..2870f3158fb6 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/default.nix b/nixpkgs/pkgs/applications/networking/protonvpn-cli/default.nix
index e79ca515b518..e79ca515b518 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 5b292fe7bec5..5b292fe7bec5 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 571df924e1f8..571df924e1f8 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 6a89731ff104..6a89731ff104 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 a9b358fc7937..a9b358fc7937 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-receiver/default.nix b/nixpkgs/pkgs/applications/networking/remote/citrix-receiver/default.nix
index d6e25ae4e7b5..d6e25ae4e7b5 100644
--- a/pkgs/applications/networking/remote/citrix-receiver/default.nix
+++ b/nixpkgs/pkgs/applications/networking/remote/citrix-receiver/default.nix
diff --git a/pkgs/applications/networking/remote/citrix-receiver/wrapper.nix b/nixpkgs/pkgs/applications/networking/remote/citrix-receiver/wrapper.nix
index 63587030b38e..63587030b38e 100644
--- a/pkgs/applications/networking/remote/citrix-receiver/wrapper.nix
+++ b/nixpkgs/pkgs/applications/networking/remote/citrix-receiver/wrapper.nix
diff --git a/pkgs/applications/networking/remote/citrix-workspace/default.nix b/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/default.nix
index 13a16a6e2245..13a16a6e2245 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 ea475ae6dbc9..ea475ae6dbc9 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 0653686c650d..0653686c650d 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 fdd367f97c03..fdd367f97c03 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 5f737cacb465..5f737cacb465 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 fb577f09120b..fb577f09120b 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/ssvnc/default.nix b/nixpkgs/pkgs/applications/networking/remote/ssvnc/default.nix
index 99835627f879..99835627f879 100644
--- a/pkgs/applications/networking/remote/ssvnc/default.nix
+++ b/nixpkgs/pkgs/applications/networking/remote/ssvnc/default.nix
diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix
index d97f376b9a2a..d97f376b9a2a 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/x2goclient/default.nix b/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix
index 87fe60c7740c..87fe60c7740c 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/xrdp/default.nix b/nixpkgs/pkgs/applications/networking/remote/xrdp/default.nix
index 442881398f63..442881398f63 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 1844711066b0..1844711066b0 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 543afc696ea0..543afc696ea0 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 69ae40b76180..69ae40b76180 100644
--- a/pkgs/applications/networking/sieve-connect/default.nix
+++ b/nixpkgs/pkgs/applications/networking/sieve-connect/default.nix
diff --git a/pkgs/applications/networking/sipcmd/default.nix b/nixpkgs/pkgs/applications/networking/sipcmd/default.nix
index a36c2286956b..a36c2286956b 100644
--- a/pkgs/applications/networking/sipcmd/default.nix
+++ b/nixpkgs/pkgs/applications/networking/sipcmd/default.nix
diff --git a/pkgs/applications/networking/siproxd/cheaders.patch b/nixpkgs/pkgs/applications/networking/siproxd/cheaders.patch
index 69a3e3287371..69a3e3287371 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 cd697f107b35..cd697f107b35 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 81c48cff4a01..81c48cff4a01 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 13d536ccf1bb..13d536ccf1bb 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 0c793c41c55a..0c793c41c55a 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/wireshark/default.nix b/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix
index 401e49648013..401e49648013 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 549da5436e60..549da5436e60 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 10bb465b8a1b..10bb465b8a1b 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 1034acf0b90f..1034acf0b90f 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 a38a9140b490..a38a9140b490 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 d96a810ee05a..d96a810ee05a 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 1f8d0cba6d05..1f8d0cba6d05 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 40026275a1e3..40026275a1e3 100644
--- a/pkgs/applications/networking/ssb/patchwork/default.nix
+++ b/nixpkgs/pkgs/applications/networking/ssb/patchwork/default.nix
diff --git a/pkgs/applications/networking/super-productivity/default.nix b/nixpkgs/pkgs/applications/networking/super-productivity/default.nix
index 9bb4254c64a2..9bb4254c64a2 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 e4ba29d3a9f8..e4ba29d3a9f8 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 fae838a7d5f8..fae838a7d5f8 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 26288f9f6e65..26288f9f6e65 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 8d9b941e26e4..8d9b941e26e4 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 6dcd451533ae..6dcd451533ae 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 7f5f3251d162..7f5f3251d162 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 b0315ee3477d..b0315ee3477d 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/rclone/browser.nix b/nixpkgs/pkgs/applications/networking/sync/rclone/browser.nix
index 4325c8ea88ae..4325c8ea88ae 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 13d55bcf476d..13d55bcf476d 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 fc4bc6c0671e..fc4bc6c0671e 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 4045c1f0fc51..4045c1f0fc51 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 12f992d44a5a..12f992d44a5a 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 ad5a35eb251f..ad5a35eb251f 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 c8610d80ca78..c8610d80ca78 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 696ced2d2465..696ced2d2465 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 0ba5a4f2db84..0ba5a4f2db84 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 58ac15253aed..58ac15253aed 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 cc916e069a00..cc916e069a00 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/nixpkgs/pkgs/applications/networking/syncthing/default.nix
diff --git a/pkgs/applications/networking/syncthing/deps.nix b/nixpkgs/pkgs/applications/networking/syncthing/deps.nix
index 4a58a490cc5a..4a58a490cc5a 100644
--- a/pkgs/applications/networking/syncthing/deps.nix
+++ b/nixpkgs/pkgs/applications/networking/syncthing/deps.nix
diff --git a/pkgs/applications/networking/tcpkali/default.nix b/nixpkgs/pkgs/applications/networking/tcpkali/default.nix
index 8a056e21692b..8a056e21692b 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 0c30a3def336..0c30a3def336 100644
--- a/pkgs/applications/networking/testssl/default.nix
+++ b/nixpkgs/pkgs/applications/networking/testssl/default.nix
diff --git a/pkgs/applications/networking/transporter/default.nix b/nixpkgs/pkgs/applications/networking/transporter/default.nix
index 46649c069111..46649c069111 100644
--- a/pkgs/applications/networking/transporter/default.nix
+++ b/nixpkgs/pkgs/applications/networking/transporter/default.nix
diff --git a/pkgs/applications/networking/tsung/default.nix b/nixpkgs/pkgs/applications/networking/tsung/default.nix
index 050c8502e077..050c8502e077 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 a1fe790b1190..a1fe790b1190 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 7b3e62779e95..7b3e62779e95 100644
--- a/pkgs/applications/networking/vnstat/default.nix
+++ b/nixpkgs/pkgs/applications/networking/vnstat/default.nix
diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/nixpkgs/pkgs/applications/networking/weather/meteo/default.nix
index 4c183dd4607b..4c183dd4607b 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 4160e70b9c44..4160e70b9c44 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 08fa53a6e388..08fa53a6e388 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 fce885a25941..fce885a25941 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 6808a81bec1d..6808a81bec1d 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 470eabdf6e47..470eabdf6e47 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 ebf2f0900d98..ebf2f0900d98 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 96a518a7a28f..96a518a7a28f 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 91b12d8a33c3..91b12d8a33c3 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 80b60dbc468c..80b60dbc468c 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 31e74ccf23a1..31e74ccf23a1 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 73372e435291..73372e435291 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 9eec315217cb..9eec315217cb 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 fe81340a7fb4..fe81340a7fb4 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 4a050eb5d749..4a050eb5d749 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 66ff8c6eedcd..66ff8c6eedcd 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 461d428787b9..461d428787b9 100644
--- a/pkgs/applications/office/cb2bib/default.nix
+++ b/nixpkgs/pkgs/applications/office/cb2bib/default.nix
diff --git a/pkgs/applications/office/docear/default.nix b/nixpkgs/pkgs/applications/office/docear/default.nix
index 0d2341113b48..0d2341113b48 100644
--- a/pkgs/applications/office/docear/default.nix
+++ b/nixpkgs/pkgs/applications/office/docear/default.nix
diff --git a/pkgs/applications/office/fava/default.nix b/nixpkgs/pkgs/applications/office/fava/default.nix
index e33a0b202da0..e33a0b202da0 100644
--- a/pkgs/applications/office/fava/default.nix
+++ b/nixpkgs/pkgs/applications/office/fava/default.nix
diff --git a/pkgs/applications/office/gnucash/default.nix b/nixpkgs/pkgs/applications/office/gnucash/default.nix
index e4a89b513e9c..e4a89b513e9c 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 70d1e3d79ba5..70d1e3d79ba5 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 338cdc170656..338cdc170656 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 9f45a70e8b8d..9f45a70e8b8d 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 b39617e02db2..b39617e02db2 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 59ecb5a5c3b7..59ecb5a5c3b7 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 8946bbab9316..8946bbab9316 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 ebd5a14ad047..ebd5a14ad047 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 61cc3ea78f05..61cc3ea78f05 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 2e0b3f3fed7d..2e0b3f3fed7d 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 e28a2d0852b6..e28a2d0852b6 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 a29e256675f8..a29e256675f8 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 4c126fc2f919..4c126fc2f919 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 77e8024da3a3..77e8024da3a3 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 f18460420c5d..f18460420c5d 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 13c559cfac10..13c559cfac10 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 71a959c0a86a..71a959c0a86a 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 60fff1d0131b..60fff1d0131b 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 276134efd73d..276134efd73d 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 eb21fe2f441e..eb21fe2f441e 100644
--- a/pkgs/applications/office/libreoffice/README.md
+++ b/nixpkgs/pkgs/applications/office/libreoffice/README.md
diff --git a/pkgs/applications/office/libreoffice/default-gen-shell.nix b/nixpkgs/pkgs/applications/office/libreoffice/default-gen-shell.nix
index 366030971237..366030971237 100644
--- a/pkgs/applications/office/libreoffice/default-gen-shell.nix
+++ b/nixpkgs/pkgs/applications/office/libreoffice/default-gen-shell.nix
diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/nixpkgs/pkgs/applications/office/libreoffice/default-primary-src.nix
index fbf6047af605..fbf6047af605 100644
--- a/pkgs/applications/office/libreoffice/default-primary-src.nix
+++ b/nixpkgs/pkgs/applications/office/libreoffice/default-primary-src.nix
diff --git a/pkgs/applications/office/libreoffice/default.nix b/nixpkgs/pkgs/applications/office/libreoffice/default.nix
index a82999366627..a82999366627 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 c054e2c72cbe..c054e2c72cbe 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/generate-libreoffice-srcs.py b/nixpkgs/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py
index 636f36cb383b..636f36cb383b 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 5b4363189f7f..5b4363189f7f 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/libreoffice-srcs-still.nix b/nixpkgs/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
index adec14748088..adec14748088 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
+++ b/nixpkgs/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/nixpkgs/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
index bfb74d1bb507..bfb74d1bb507 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/nixpkgs/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
diff --git a/pkgs/applications/office/libreoffice/still-gen-shell.nix b/nixpkgs/pkgs/applications/office/libreoffice/still-gen-shell.nix
index c5c17c2aaad0..c5c17c2aaad0 100644
--- a/pkgs/applications/office/libreoffice/still-gen-shell.nix
+++ b/nixpkgs/pkgs/applications/office/libreoffice/still-gen-shell.nix
diff --git a/pkgs/applications/office/libreoffice/still-primary-src.nix b/nixpkgs/pkgs/applications/office/libreoffice/still-primary-src.nix
index 8049a664e138..8049a664e138 100644
--- a/pkgs/applications/office/libreoffice/still-primary-src.nix
+++ b/nixpkgs/pkgs/applications/office/libreoffice/still-primary-src.nix
diff --git a/pkgs/applications/office/libreoffice/still.nix b/nixpkgs/pkgs/applications/office/libreoffice/still.nix
index efcc4407842b..efcc4407842b 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/nixpkgs/pkgs/applications/office/libreoffice/still.nix
diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/nixpkgs/pkgs/applications/office/libreoffice/wrapper.nix
index ce8910d76d45..ce8910d76d45 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 62569734745c..62569734745c 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 0a2f02e71fed..0a2f02e71fed 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 cdda46d4837f..cdda46d4837f 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 3c4434f0098c..3c4434f0098c 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 56becea9959a..56becea9959a 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 85e8bc131ce3..85e8bc131ce3 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 3ddca8fe7620..3ddca8fe7620 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 ad621303d7d3..ad621303d7d3 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 a7887357cd30..a7887357cd30 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 f8729583ddce..f8729583ddce 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 20f8b428f0db..20f8b428f0db 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 f1dd10e9420f..f1dd10e9420f 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 d3668d057ee4..d3668d057ee4 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 ffe94d10d5c3..ffe94d10d5c3 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 aafdfe67adb4..aafdfe67adb4 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 7f82780fbe92..7f82780fbe92 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 adbd4c30a393..adbd4c30a393 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 680b3fd40d72..680b3fd40d72 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 d8765d2fa61a..d8765d2fa61a 100644
--- a/pkgs/applications/office/planner/default.nix
+++ b/nixpkgs/pkgs/applications/office/planner/default.nix
diff --git a/pkgs/applications/office/qnotero/default.nix b/nixpkgs/pkgs/applications/office/qnotero/default.nix
index b317838f6722..b317838f6722 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 69fb5462ded3..69fb5462ded3 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 d6b73b07f0e5..d6b73b07f0e5 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 32758b462f75..32758b462f75 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 416c86397f86..416c86397f86 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 ecd38627ac5f..ecd38627ac5f 100644
--- a/pkgs/applications/office/skrooge/default.nix
+++ b/nixpkgs/pkgs/applications/office/skrooge/default.nix
diff --git a/pkgs/applications/office/spice-up/default.nix b/nixpkgs/pkgs/applications/office/spice-up/default.nix
index a99ac7e44b78..a99ac7e44b78 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 24542041cc87..24542041cc87 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 bbf252d28923..bbf252d28923 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 3ce845d11c10..3ce845d11c10 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 9f2ea82cee05..9f2ea82cee05 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 efeb23b3e83d..efeb23b3e83d 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 1ea489b92c3f..1ea489b92c3f 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 77a602954438..77a602954438 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 a69fb7a1c6c7..a69fb7a1c6c7 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 951b61e43ef4..951b61e43ef4 100644
--- a/pkgs/applications/office/treesheets/default.nix
+++ b/nixpkgs/pkgs/applications/office/treesheets/default.nix
diff --git a/pkgs/applications/office/trilium/default.nix b/nixpkgs/pkgs/applications/office/trilium/default.nix
index c1e2fdcc7dfa..c1e2fdcc7dfa 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 4422aaa2b448..4422aaa2b448 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 dc63acd6db64..dc63acd6db64 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 dea3ea9731b0..dea3ea9731b0 100644
--- a/pkgs/applications/office/tudu/default.nix
+++ b/nixpkgs/pkgs/applications/office/tudu/default.nix
diff --git a/pkgs/applications/office/vnote/default.nix b/nixpkgs/pkgs/applications/office/vnote/default.nix
index b02bf5058740..b02bf5058740 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 16df0b294c16..16df0b294c16 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 4271e3d17aa2..4271e3d17aa2 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 4c83d67f7cda..4c83d67f7cda 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 f8785616c5e6..f8785616c5e6 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 a41064666d58..a41064666d58 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 3540fce9173a..3540fce9173a 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 8941097fc422..8941097fc422 100644
--- a/pkgs/applications/office/zotero/zotero.sh
+++ b/nixpkgs/pkgs/applications/office/zotero/zotero.sh
diff --git a/pkgs/applications/radio/airspy/default.nix b/nixpkgs/pkgs/applications/radio/airspy/default.nix
index 2042f1047b22..2042f1047b22 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 fc38f6be4cca..fc38f6be4cca 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 1c6d0478f76c..1c6d0478f76c 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 07bf0a542fa3..07bf0a542fa3 100644
--- a/pkgs/applications/radio/cubicsdr/default.nix
+++ b/nixpkgs/pkgs/applications/radio/cubicsdr/default.nix
diff --git a/pkgs/applications/radio/dmrconfig/default.nix b/nixpkgs/pkgs/applications/radio/dmrconfig/default.nix
index 7125e37f7f95..7125e37f7f95 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 41ddb671a369..41ddb671a369 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 c7aafe5227a5..c7aafe5227a5 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 915d0ba84db3..915d0ba84db3 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 fd8c542fb42e..fd8c542fb42e 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 713755d8a654..713755d8a654 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 87674e6084bd..87674e6084bd 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 2b4a679accab..2b4a679accab 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 b96f3c2b3278..b96f3c2b3278 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 6cbdea8c6867..6cbdea8c6867 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 7c6db61b5291..7c6db61b5291 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 f9a50313c472..f9a50313c472 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 119b7f7600f9..119b7f7600f9 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 af3cabac9ef7..af3cabac9ef7 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 c3c8721be258..c3c8721be258 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 df2a88033c46..df2a88033c46 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 b56e0d226871..b56e0d226871 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 ffed3da03187..ffed3da03187 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 1258dd32b9f5..1258dd32b9f5 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 81a66bf503c0..81a66bf503c0 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 e2232c4b2ec8..e2232c4b2ec8 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 0bd6f573ead0..0bd6f573ead0 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 19ebd05e23c1..19ebd05e23c1 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 3ff73c4ef2ab..3ff73c4ef2ab 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 8d179e8eed11..8d179e8eed11 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 b58872975aea..b58872975aea 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 40a168675f67..40a168675f67 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 c8401cdbf49e..c8401cdbf49e 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 a4d5b2cad1e9..a4d5b2cad1e9 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 88dc64471ec7..88dc64471ec7 100644
--- a/pkgs/applications/radio/rtl_433/default.nix
+++ b/nixpkgs/pkgs/applications/radio/rtl_433/default.nix
diff --git a/pkgs/applications/radio/soapyairspy/default.nix b/nixpkgs/pkgs/applications/radio/soapyairspy/default.nix
index 1d8056ca1e81..1d8056ca1e81 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 5472254b19dc..5472254b19dc 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 2c5dd058ced3..2c5dd058ced3 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 a0057978ea33..a0057978ea33 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 d85fe347cd74..d85fe347cd74 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 6754e8f2a55c..6754e8f2a55c 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 6ed88e0431e3..6ed88e0431e3 100644
--- a/pkgs/applications/radio/soapyuhd/default.nix
+++ b/nixpkgs/pkgs/applications/radio/soapyuhd/default.nix
diff --git a/pkgs/applications/radio/tlf/default.nix b/nixpkgs/pkgs/applications/radio/tlf/default.nix
index 92183306038b..92183306038b 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 ce0fbf0e16dc..ce0fbf0e16dc 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 fd0bd8d5d75f..fd0bd8d5d75f 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 18ec59c1d64b..18ec59c1d64b 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 2aeba5fb5f4a..2aeba5fb5f4a 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 0475c008ba22..0475c008ba22 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 58a0b8048b56..58a0b8048b56 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 acf0226c0db5..acf0226c0db5 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 6e287b571d75..6e287b571d75 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 d903171ffc5a..d903171ffc5a 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 e92b420e58a4..e92b420e58a4 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 7b9cf0a4ee55..7b9cf0a4ee55 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 3150d41ca9f6..3150d41ca9f6 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 e3ceffd34c19..e3ceffd34c19 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 40696a03dec7..40696a03dec7 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 4d6654a99aee..4d6654a99aee 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 9f65c63f7a6f..9f65c63f7a6f 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/wrapper.patch b/nixpkgs/pkgs/applications/science/astronomy/gildas/wrapper.patch
index 2e470a1e9cdc..2e470a1e9cdc 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 9bacf6d90417..9bacf6d90417 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 03d0018f237b..03d0018f237b 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 38c17ad4593a..38c17ad4593a 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 826edea09071..826edea09071 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 d9fc91d7c277..d9fc91d7c277 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 ee3a71cf1813..ee3a71cf1813 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 9386d0257b7f..9386d0257b7f 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 2480b80316eb..2480b80316eb 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 fef4ca1907fd..fef4ca1907fd 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 5f02dc27a224..5f02dc27a224 100644
--- a/pkgs/applications/science/astronomy/xplanet/default.nix
+++ b/nixpkgs/pkgs/applications/science/astronomy/xplanet/default.nix
diff --git a/pkgs/applications/science/astronomy/xplanet/gcc6.patch b/nixpkgs/pkgs/applications/science/astronomy/xplanet/gcc6.patch
index b30385a50f83..b30385a50f83 100644
--- a/pkgs/applications/science/astronomy/xplanet/gcc6.patch
+++ b/nixpkgs/pkgs/applications/science/astronomy/xplanet/gcc6.patch
diff --git a/pkgs/applications/science/astronomy/xplanet/giflib.patch b/nixpkgs/pkgs/applications/science/astronomy/xplanet/giflib.patch
index 653b9c8dc7d6..653b9c8dc7d6 100644
--- a/pkgs/applications/science/astronomy/xplanet/giflib.patch
+++ b/nixpkgs/pkgs/applications/science/astronomy/xplanet/giflib.patch
diff --git a/pkgs/applications/science/biology/EZminc/default.nix b/nixpkgs/pkgs/applications/science/biology/EZminc/default.nix
index dbcfead6b1ea..dbcfead6b1ea 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 d2dbcf185330..d2dbcf185330 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 d1a990a5eb28..d1a990a5eb28 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 a5f0ebc18abd..a5f0ebc18abd 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/bcftools/default.nix b/nixpkgs/pkgs/applications/science/biology/bcftools/default.nix
index 539d7c224463..539d7c224463 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 406f42e9ad7b..406f42e9ad7b 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 24a6e052df9e..24a6e052df9e 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/bowtie2/default.nix b/nixpkgs/pkgs/applications/science/biology/bowtie2/default.nix
index 21e2f56bdf97..21e2f56bdf97 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 d1dbacf053fb..d1dbacf053fb 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 1a41a28a19aa..1a41a28a19aa 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 3464e134ee85..3464e134ee85 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 56de61da1c5a..56de61da1c5a 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 23182fcadc6b..23182fcadc6b 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 0e2b5d8b25fe..0e2b5d8b25fe 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/diamond/default.nix b/nixpkgs/pkgs/applications/science/biology/diamond/default.nix
index 854e91b2fcbb..854e91b2fcbb 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 a16d475c5564..a16d475c5564 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 9e1b16ff9449..9e1b16ff9449 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 c9a9b55c31e6..c9a9b55c31e6 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 2110a9bcfaba..2110a9bcfaba 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/exonerate/default.nix b/nixpkgs/pkgs/applications/science/biology/exonerate/default.nix
index 1dd6b44692a3..1dd6b44692a3 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 1a15dcf6197d..1a15dcf6197d 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 9ccf54a81133..9ccf54a81133 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 e43d48db55f3..e43d48db55f3 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 95dc2b612e22..95dc2b612e22 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 9e63b92b24ed..9e63b92b24ed 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 953bce9a1848..953bce9a1848 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 75dc46a799ce..75dc46a799ce 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 0c8c7313bf2a..0c8c7313bf2a 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 37abcf396211..37abcf396211 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 d80ffea9a780..d80ffea9a780 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/megahit/default.nix b/nixpkgs/pkgs/applications/science/biology/megahit/default.nix
index 56bb35b64df8..56bb35b64df8 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 dbbf8d39a93c..dbbf8d39a93c 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 d80e6e7b30df..d80e6e7b30df 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 033f78609e9a..033f78609e9a 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 497c39a52a4c..497c39a52a4c 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/minimap2/default.nix b/nixpkgs/pkgs/applications/science/biology/minimap2/default.nix
index 84c65feb0937..84c65feb0937 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 ab22fb7232ff..ab22fb7232ff 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 1bdb31616e4d..1bdb31616e4d 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 5b3a54946fc9..5b3a54946fc9 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 1dd92af58eb1..1dd92af58eb1 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 9cbabc7ab37e..9cbabc7ab37e 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 7f4b2129518d..7f4b2129518d 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 1c24ef092542..1c24ef092542 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 875e98499f53..875e98499f53 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 923bffb1c338..923bffb1c338 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 9f1cb8db43d5..9f1cb8db43d5 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 e7221855503c..e7221855503c 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 0a2074a06e97..0a2074a06e97 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 68efc2030e53..68efc2030e53 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 5fc222bb2993..5fc222bb2993 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 323ca90f0a2a..323ca90f0a2a 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 2efb59f536f6..2efb59f536f6 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 cc48a0cb13a9..cc48a0cb13a9 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 3bb9ea06fd46..3bb9ea06fd46 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 653f4390488e..653f4390488e 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 140f70323194..140f70323194 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 c4b4bb522c40..c4b4bb522c40 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 a7782a1a0264..a7782a1a0264 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 a811bc4412f2..a811bc4412f2 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 17cf903ae49c..17cf903ae49c 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 dc2246903349..dc2246903349 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 4bbd6a320035..4bbd6a320035 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 9af04c0a0696..9af04c0a0696 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/stacks/default.nix b/nixpkgs/pkgs/applications/science/biology/stacks/default.nix
index d188ca02b183..d188ca02b183 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 f32dca86bdf5..f32dca86bdf5 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 1527f5d3ddad..1527f5d3ddad 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 f9042f300113..f9042f300113 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/varscan/default.nix b/nixpkgs/pkgs/applications/science/biology/varscan/default.nix
index f685031e87e4..f685031e87e4 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 a6f52ae97b59..a6f52ae97b59 100755
--- a/pkgs/applications/science/biology/vcftools/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/vcftools/default.nix
diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/nixpkgs/pkgs/applications/science/chemistry/avogadro/default.nix
index a569b82ff59d..a569b82ff59d 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 92f997900d53..92f997900d53 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 84c01cbfd673..84c01cbfd673 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 90b8ed7d20a5..90b8ed7d20a5 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 d6e0343a78c3..d6e0343a78c3 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 07a3c3c7cf33..07a3c3c7cf33 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 948aed03fe5e..948aed03fe5e 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 274afd5fc3d8..274afd5fc3d8 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 75ce593ed29a..75ce593ed29a 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 4b580a6cf52e..4b580a6cf52e 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 bc6301e1fd42..bc6301e1fd42 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 7b482d82e2fa..7b482d82e2fa 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 5e1c77e24751..5e1c77e24751 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 eb17a68b8aae..eb17a68b8aae 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 236225959f7a..236225959f7a 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 63bc0911d251..63bc0911d251 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 016760bde020..016760bde020 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 64777b5a0ac8..64777b5a0ac8 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 58e01f4f9f49..58e01f4f9f49 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 8f81a03044be..8f81a03044be 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 04c8f4502b2d..04c8f4502b2d 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 ecbbeff108d2..ecbbeff108d2 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 e30a28d80fa3..e30a28d80fa3 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 c42b70c041af..c42b70c041af 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 214f77663434..214f77663434 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 90b7db4b545c..90b7db4b545c 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 69b111562ab2..69b111562ab2 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 da9da4dcbd3a..da9da4dcbd3a 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 e6e7219ff871..e6e7219ff871 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 ab5088543102..ab5088543102 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 93fe7b6ba77a..93fe7b6ba77a 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 c0821c8a9ab9..c0821c8a9ab9 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 4830e2a032a9..4830e2a032a9 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/default.nix b/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix
index 6608661364a0..6608661364a0 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/unstable.nix b/nixpkgs/pkgs/applications/science/electronics/kicad/unstable.nix
index a9a4c32a0b45..a9a4c32a0b45 100644
--- a/pkgs/applications/science/electronics/kicad/unstable.nix
+++ b/nixpkgs/pkgs/applications/science/electronics/kicad/unstable.nix
diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix
index 277574ce2f17..277574ce2f17 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 194804a21a67..194804a21a67 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 b9bbcd695f17..b9bbcd695f17 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 c91443bf64a5..c91443bf64a5 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 6ca3f80cefd3..6ca3f80cefd3 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 965d67ac5526..965d67ac5526 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 5cedc6476397..5cedc6476397 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 27066f09c84e..27066f09c84e 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 1a5fbf90d10b..1a5fbf90d10b 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 2c346b0e74a0..2c346b0e74a0 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 b531563c5c1c..b531563c5c1c 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 83352df18e6e..83352df18e6e 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 418144e6af7b..418144e6af7b 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 829caacb55cb..829caacb55cb 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 993df9cb5503..993df9cb5503 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 e233b91bbc91..e233b91bbc91 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 7364cae5f58d..7364cae5f58d 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 3a2dbf180ee3..3a2dbf180ee3 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 b655cc48c731..b655cc48c731 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 6e7a3cfc88ac..6e7a3cfc88ac 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 bc23454edfc7..bc23454edfc7 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 729aef4e21c2..729aef4e21c2 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 03524fc6b222..03524fc6b222 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 234b74749977..234b74749977 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 bf8d3cf03b83..bf8d3cf03b83 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 a53142faba66..a53142faba66 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 6c2d2f0a062f..6c2d2f0a062f 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 dd19f7ec80e7..dd19f7ec80e7 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 686d5a1c5b49..686d5a1c5b49 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 da0e9bf1c1dd..da0e9bf1c1dd 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 8e0ad22bba18..8e0ad22bba18 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 ed3d9e638121..ed3d9e638121 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 4cef49788c04..4cef49788c04 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 708270f772fd..708270f772fd 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 ae57724e4f88..ae57724e4f88 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 2373ae43e76e..2373ae43e76e 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 d76462ca9380..d76462ca9380 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 c9516a135c06..c9516a135c06 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 cd8a3747bea1..cd8a3747bea1 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 91eaaeeb0e40..91eaaeeb0e40 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 1fb3516b8c27..1fb3516b8c27 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 703ce6fd5086..703ce6fd5086 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 cddcbef7a035..cddcbef7a035 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 686d5a1c5b49..686d5a1c5b49 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 50454847baf1..50454847baf1 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 e1eb9a2dcc3b..e1eb9a2dcc3b 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 310e93ea53fd..310e93ea53fd 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 bc4f526bb3a4..bc4f526bb3a4 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 dab509706a82..dab509706a82 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 21ce6be3e6c1..21ce6be3e6c1 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 7522eb4790ed..7522eb4790ed 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 bc8d372ce42c..bc8d372ce42c 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 30af3216737c..30af3216737c 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 d6a1eb6cbf71..d6a1eb6cbf71 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 40b0115dc1b7..40b0115dc1b7 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 46b29e3dd271..46b29e3dd271 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 024f2f4e8294..024f2f4e8294 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 a95d1201cbd6..a95d1201cbd6 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 d7f047b84e0f..d7f047b84e0f 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 407244ef1830..407244ef1830 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 4e1415d3961d..4e1415d3961d 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 be337a1c258e..be337a1c258e 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 52b8ed1cdaa2..52b8ed1cdaa2 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 dcea9c27acb4..dcea9c27acb4 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 000587a22e67..000587a22e67 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 db784237ea91..db784237ea91 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 c77e0327fb6b..c77e0327fb6b 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 dc32e84279a8..dc32e84279a8 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 1601a74e1899..1601a74e1899 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/clang.diff b/nixpkgs/pkgs/applications/science/logic/minisat/clang.diff
index 5b5072c71f3f..5b5072c71f3f 100644
--- a/pkgs/applications/science/logic/minisat/clang.diff
+++ b/nixpkgs/pkgs/applications/science/logic/minisat/clang.diff
diff --git a/pkgs/applications/science/logic/minisat/darwin.patch b/nixpkgs/pkgs/applications/science/logic/minisat/darwin.patch
index f2b618d6bb3a..f2b618d6bb3a 100644
--- a/pkgs/applications/science/logic/minisat/darwin.patch
+++ b/nixpkgs/pkgs/applications/science/logic/minisat/darwin.patch
diff --git a/pkgs/applications/science/logic/minisat/default.nix b/nixpkgs/pkgs/applications/science/logic/minisat/default.nix
index 4b2116680d50..4b2116680d50 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/minisat/unstable.nix b/nixpkgs/pkgs/applications/science/logic/minisat/unstable.nix
index f1a42f8215e3..f1a42f8215e3 100644
--- a/pkgs/applications/science/logic/minisat/unstable.nix
+++ b/nixpkgs/pkgs/applications/science/logic/minisat/unstable.nix
diff --git a/pkgs/applications/science/logic/monosat/default.nix b/nixpkgs/pkgs/applications/science/logic/monosat/default.nix
index 54bedc7c5e97..54bedc7c5e97 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 48546a86112b..48546a86112b 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 f9f021b15f07..f9f021b15f07 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 d21487ef92fa..d21487ef92fa 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 a7eec20548c9..a7eec20548c9 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 cb35b9f27d52..cb35b9f27d52 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/picosat/default.nix b/nixpkgs/pkgs/applications/science/logic/picosat/default.nix
index 638996e853b8..638996e853b8 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 2f765572f9ad..2f765572f9ad 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 4abfdf9162c0..4abfdf9162c0 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 062577d1451b..062577d1451b 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 1f6620a2872d..1f6620a2872d 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 a4538e1070a3..a4538e1070a3 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 aca06ffbfb76..aca06ffbfb76 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 9da2647d1138..9da2647d1138 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 8e94356f376a..8e94356f376a 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 da9c21bcae91..da9c21bcae91 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 a5b1d6177083..a5b1d6177083 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 b9dd90f601f5..b9dd90f601f5 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 32ebdad51d94..32ebdad51d94 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 2bb2b911d491..2bb2b911d491 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 9676b991679c..9676b991679c 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 081dc788163b..081dc788163b 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 8ba77159693e..8ba77159693e 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 40378f8c04d5..40378f8c04d5 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 6ab7e4e7594f..6ab7e4e7594f 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 b1eb171b20b1..b1eb171b20b1 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 7d35f5f91df3..7d35f5f91df3 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 f1116a27c0be..f1116a27c0be 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 7f68a8e647e9..7f68a8e647e9 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 74f8875fcebe..74f8875fcebe 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 08ab243fb96a..08ab243fb96a 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 22eb5d07f1c1..22eb5d07f1c1 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 ca3673d7bf97..ca3673d7bf97 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/default.nix b/nixpkgs/pkgs/applications/science/logic/why3/default.nix
index a3b369ad54a3..a3b369ad54a3 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/workcraft/default.nix b/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix
index 313fe5a9f1dd..313fe5a9f1dd 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 40a4c391e1d5..40a4c391e1d5 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 14f75fb68b5e..14f75fb68b5e 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 34449542abb2..34449542abb2 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 0ae9a74d0d0a..0ae9a74d0d0a 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 340073b016e3..340073b016e3 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 c0536b36cfe3..c0536b36cfe3 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 6eec10e958c2..6eec10e958c2 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 8de78092bd84..8de78092bd84 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/torch/default.nix b/nixpkgs/pkgs/applications/science/machine-learning/torch/default.nix
index bdeeaad189a7..bdeeaad189a7 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 9c4f24021430..9c4f24021430 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 e0b0bc11f05f..e0b0bc11f05f 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 a791f9a57727..a791f9a57727 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 6c7f6d4ee02a..6c7f6d4ee02a 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 6951e2a4b61b..6951e2a4b61b 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 b5d9632c551d..b5d9632c551d 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 61eb1fd3ce4e..61eb1fd3ce4e 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 1b7a97360079..1b7a97360079 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 e8fa6a683f73..e8fa6a683f73 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 3367fa87422b..3367fa87422b 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 b1bed6c174b8..b1bed6c174b8 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 24cddfb9a1c2..24cddfb9a1c2 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/cbc/default.nix b/nixpkgs/pkgs/applications/science/math/cbc/default.nix
index d0857e2a517c..d0857e2a517c 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 0beee1eb2915..0beee1eb2915 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 465c7318c0e3..465c7318c0e3 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 94e0a44226d4..94e0a44226d4 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 a14839d3eccc..a14839d3eccc 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 9b402fe0ac94..9b402fe0ac94 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 7b768f7077e7..7b768f7077e7 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 6d1c778d1e0e..6d1c778d1e0e 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 23ab2184266a..23ab2184266a 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 7d1f738641a6..7d1f738641a6 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 7eb10d1f9525..7eb10d1f9525 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 3232d08aa339..3232d08aa339 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 74e4b052fdb5..74e4b052fdb5 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 d2d1ddb65846..d2d1ddb65846 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 ad82d7572e34..ad82d7572e34 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 197845bfa3c1..197845bfa3c1 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 4de683cdce90..4de683cdce90 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 1a3ba8096e29..1a3ba8096e29 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 ee9bdcc6f1b0..ee9bdcc6f1b0 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 9eab9ca39992..9eab9ca39992 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 1d1fb96a4739..1d1fb96a4739 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 0cf834c8cdea..0cf834c8cdea 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 bc1983d4423d..bc1983d4423d 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 9e02b08c8ad0..9e02b08c8ad0 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 c6802c3719e9..c6802c3719e9 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/9.nix b/nixpkgs/pkgs/applications/science/math/mathematica/9.nix
index 1023e7ca3d5c..1023e7ca3d5c 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 165a56605579..165a56605579 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 065360a112d8..065360a112d8 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 583391d08dde..583391d08dde 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 5843f38a74a8..5843f38a74a8 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 f1d612d993e6..f1d612d993e6 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 6e1926810df0..6e1926810df0 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 e2e4ba63b07e..e2e4ba63b07e 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 c2f8ba1d55ec..c2f8ba1d55ec 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 226e13c004d7..226e13c004d7 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/palp/default.nix b/nixpkgs/pkgs/applications/science/math/palp/default.nix
index e9fd21b46d8a..e9fd21b46d8a 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 72827112c50c..72827112c50c 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 4915e42025b5..4915e42025b5 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 3e7d9898a656..3e7d9898a656 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 2d150d0c30e9..2d150d0c30e9 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 4fba231f094d..4fba231f094d 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 c53e87caa9ad..c53e87caa9ad 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 75a46bb182ae..75a46bb182ae 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 4da3a3f3d7bc..4da3a3f3d7bc 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 2dd4778234df..2dd4778234df 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 4b237a01a3e5..4b237a01a3e5 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 5e0b7fc300ba..5e0b7fc300ba 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 26e91fc63133..26e91fc63133 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 caf51c3da251..caf51c3da251 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/env-locations.nix b/nixpkgs/pkgs/applications/science/math/sage/env-locations.nix
index bda2d23b9e52..bda2d23b9e52 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 85e35736d030..85e35736d030 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 9043fabd9b4a..9043fabd9b4a 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 8cd80281d0e4..8cd80281d0e4 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/do-not-test-find-library.patch b/nixpkgs/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch
index 3f844e1b1ef5..3f844e1b1ef5 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 6056416c3a28..6056416c3a28 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/pari-stackwarn.patch b/nixpkgs/pkgs/applications/science/math/sage/patches/pari-stackwarn.patch
index 49cdfd189b92..49cdfd189b92 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 1b64f39fe60f..1b64f39fe60f 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/sphinx-docbuild-subprocesses.patch b/nixpkgs/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch
index 933344aa5591..933344aa5591 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/threejs-offline.patch b/nixpkgs/pkgs/applications/science/math/sage/patches/threejs-offline.patch
index 62b2f114bd62..62b2f114bd62 100644
--- a/pkgs/applications/science/math/sage/patches/threejs-offline.patch
+++ b/nixpkgs/pkgs/applications/science/math/sage/patches/threejs-offline.patch
diff --git a/pkgs/applications/science/math/sage/pybrial.nix b/nixpkgs/pkgs/applications/science/math/sage/pybrial.nix
index f5cb39603c32..f5cb39603c32 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 1bfe02f50df1..1bfe02f50df1 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 8fd69f62171a..8fd69f62171a 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 51460154c5de..51460154c5de 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 591fa192d563..591fa192d563 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 e4b1aeae016a..e4b1aeae016a 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 f6dc21d00184..f6dc21d00184 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 91c880673a12..91c880673a12 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 1040d6d4ba15..1040d6d4ba15 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 03b5b7a3bbf9..03b5b7a3bbf9 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 262ee7d0d5da..262ee7d0d5da 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 01fb58403cad..01fb58403cad 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 8fa020ba07c9..8fa020ba07c9 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 24063216db04..24063216db04 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 d36b135531c2..d36b135531c2 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 bc971606cd08..bc971606cd08 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 3bfb22dad936..3bfb22dad936 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 13ccd70c83f9..13ccd70c83f9 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 c02ef73df119..c02ef73df119 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 2633f4c8db1b..2633f4c8db1b 100644
--- a/pkgs/applications/science/medicine/aliza/default.nix
+++ b/nixpkgs/pkgs/applications/science/medicine/aliza/default.nix
diff --git a/pkgs/applications/science/misc/boinc/default.nix b/nixpkgs/pkgs/applications/science/misc/boinc/default.nix
index d1da5a74e858..d1da5a74e858 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/cytoscape/default.nix b/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix
index 2262e342fc95..2262e342fc95 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 8d0336f58282..8d0336f58282 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 b81f188a91bf..b81f188a91bf 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 99159fba5b43..99159fba5b43 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 74fa4cc02ed5..74fa4cc02ed5 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 e8ce81586a8d..e8ce81586a8d 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 e429600b7095..e429600b7095 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 8b6c7497e547..8b6c7497e547 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 8cd119c7b7b0..8cd119c7b7b0 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 8265acf6e4a7..8265acf6e4a7 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 b3a56643448c..b3a56643448c 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/motu-client/default.nix b/nixpkgs/pkgs/applications/science/misc/motu-client/default.nix
index d4367ef7e2d3..d4367ef7e2d3 100644
--- a/pkgs/applications/science/misc/motu-client/default.nix
+++ b/nixpkgs/pkgs/applications/science/misc/motu-client/default.nix
diff --git a/pkgs/applications/science/misc/netlogo/default.nix b/nixpkgs/pkgs/applications/science/misc/netlogo/default.nix
index 76f958cc3a81..76f958cc3a81 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 1a1ae3df9425..1a1ae3df9425 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 de69626cd3ee..de69626cd3ee 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 aae5ab321fbe..aae5ab321fbe 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 244da64fb4e6..244da64fb4e6 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 99e82259bfe6..99e82259bfe6 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 481a89796415..481a89796415 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 972bc7d61f13..972bc7d61f13 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 4139c88ffb02..4139c88ffb02 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 f44d07d36db8..f44d07d36db8 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 39029713430c..39029713430c 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 daa8b4943227..daa8b4943227 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 871f5ece9cfe..871f5ece9cfe 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 8b9573ce4e8b..8b9573ce4e8b 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 abd6222847ef..abd6222847ef 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 6773603b8ad3..6773603b8ad3 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 fc2b697d8a82..fc2b697d8a82 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 df0ef79d0a0f..df0ef79d0a0f 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 f044bed91f3d..f044bed91f3d 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 ed6fa3ae886b..ed6fa3ae886b 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 5b6c3436494a..5b6c3436494a 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 c3cd164a899a..c3cd164a899a 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 8eff2057928a..8eff2057928a 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 d6e3f05e0e13..d6e3f05e0e13 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 751f3c3aebe3..751f3c3aebe3 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 7db2e6a12c20..7db2e6a12c20 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 64482ddd74bc..64482ddd74bc 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 1986f3b75ec1..1986f3b75ec1 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 d00b59307c52..d00b59307c52 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 f4491053e4c8..f4491053e4c8 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 ad86ff61471c..ad86ff61471c 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 c66b91b76280..c66b91b76280 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 64b88dcc3d4f..64b88dcc3d4f 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 7cb3e8881caf..7cb3e8881caf 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 ae5307f155bd..ae5307f155bd 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 53278527a807..53278527a807 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 3bfb70f5ce8e..3bfb70f5ce8e 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 e854f20d39a3..e854f20d39a3 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 c454ad377686..c454ad377686 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 152b71217743..152b71217743 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 e0993a580193..e0993a580193 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 69f355c7b843..69f355c7b843 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 6449e966959b..6449e966959b 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 0d1aa4a9085f..0d1aa4a9085f 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 98ccd92c4ee5..98ccd92c4ee5 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/qgroundcontrol/default.nix b/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix
index eae5d3766d6d..eae5d3766d6d 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/yarp/default.nix b/nixpkgs/pkgs/applications/science/robotics/yarp/default.nix
index 507481cddab2..507481cddab2 100644
--- a/pkgs/applications/science/robotics/yarp/default.nix
+++ b/nixpkgs/pkgs/applications/science/robotics/yarp/default.nix
diff --git a/pkgs/applications/search/catfish/default.nix b/nixpkgs/pkgs/applications/search/catfish/default.nix
index a0917d03ce11..a0917d03ce11 100644
--- a/pkgs/applications/search/catfish/default.nix
+++ b/nixpkgs/pkgs/applications/search/catfish/default.nix
diff --git a/pkgs/applications/search/doodle/default.nix b/nixpkgs/pkgs/applications/search/doodle/default.nix
index ba9fbee5d969..ba9fbee5d969 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 69fc0e76932c..69fc0e76932c 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 99c149b79d9d..99c149b79d9d 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 06f3733c8f79..06f3733c8f79 100644
--- a/pkgs/applications/search/recoll/default.nix
+++ b/nixpkgs/pkgs/applications/search/recoll/default.nix
diff --git a/pkgs/applications/version-management/arch/configure-tmpdir.patch b/nixpkgs/pkgs/applications/version-management/arch/configure-tmpdir.patch
index 2b39322ca22f..2b39322ca22f 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 bc62004065b3..bc62004065b3 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 a34ab0c6eb10..a34ab0c6eb10 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 18fac36daec5..18fac36daec5 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 097c1e86a897..097c1e86a897 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 d16ea2710503..d16ea2710503 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/bitkeeper/default.nix b/nixpkgs/pkgs/applications/version-management/bitkeeper/default.nix
index 26397380d57f..26397380d57f 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 569606d2fdb6..569606d2fdb6 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/bugseverywhere/default.nix b/nixpkgs/pkgs/applications/version-management/bugseverywhere/default.nix
index 6301acdf1342..6301acdf1342 100644
--- a/pkgs/applications/version-management/bugseverywhere/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/bugseverywhere/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 0a1ecbb65327..0a1ecbb65327 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 cd2b324729fb..cd2b324729fb 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 950079423685..950079423685 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 2063149dd784..2063149dd784 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 3f827a1e6981..3f827a1e6981 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 a2ebb8195db4..a2ebb8195db4 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 aa3bcb273949..aa3bcb273949 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/diffuse/default.nix b/nixpkgs/pkgs/applications/version-management/diffuse/default.nix
index fa6d4fe1890d..fa6d4fe1890d 100644
--- a/pkgs/applications/version-management/diffuse/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/diffuse/default.nix
diff --git a/pkgs/applications/version-management/fossil/default.nix b/nixpkgs/pkgs/applications/version-management/fossil/default.nix
index d0f79600e8ce..d0f79600e8ce 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 0475a8ae76ca..0475a8ae76ca 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 0d7729684163..0d7729684163 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 8ed325154711..8ed325154711 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 61159eb3ee9e..61159eb3ee9e 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 341b50f0ef22..341b50f0ef22 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 a7c1406665e7..a7c1406665e7 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 6b25ef8518c9..6b25ef8518c9 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 1af1870928ba..1af1870928ba 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 5068647e8798..5068647e8798 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/diff-so-fancy/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
index 1af2170e1699..1af2170e1699 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 c9fd33312d72..c9fd33312d72 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 52494d4ab7ed..52494d4ab7ed 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/ghq/deps.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/deps.nix
index be99aee64a5e..be99aee64a5e 100644
--- a/pkgs/applications/version-management/git-and-tools/ghq/deps.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/deps.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 82414befa912..82414befa912 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 ba64a065d281..ba64a065d281 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 4d0f33730e45..4d0f33730e45 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 479b3e7d6372..479b3e7d6372 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 8dd44287b509..8dd44287b509 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 c368dcd487e8..c368dcd487e8 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-appraise/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix
index 185ed38b5db0..185ed38b5db0 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 2d171df8bf24..2d171df8bf24 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 0baf09918d44..0baf09918d44 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 c14a027b4abe..c14a027b4abe 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 fbbb2d952422..fbbb2d952422 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 060de50f9b79..060de50f9b79 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 6a39f1fe3d1f..6a39f1fe3d1f 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 7385905cc9d9..7385905cc9d9 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 c036a0ffe4b1..c036a0ffe4b1 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 17373f02b44d..17373f02b44d 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 0ac7907fe55d..0ac7907fe55d 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 9ca7a67a53e7..9ca7a67a53e7 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 49b4af4ef6d3..49b4af4ef6d3 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 d445e0181f43..d445e0181f43 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 ded9bcc2ffdf..ded9bcc2ffdf 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 99be85e09b1e..99be85e09b1e 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 10e786222710..10e786222710 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-octopus/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix
index f8d871bdcf30..f8d871bdcf30 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 dc3fbbed1995..dc3fbbed1995 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 d72df8028759..d72df8028759 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 628c7dbac7f3..628c7dbac7f3 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 d1dce0469793..d1dce0469793 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 7d6b620e2239..7d6b620e2239 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 03435ec834ab..03435ec834ab 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 62fbab02292d..62fbab02292d 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 211685c8edb4..211685c8edb4 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 c7488e84d5d0..c7488e84d5d0 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 6a52983e83ce..6a52983e83ce 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-sync/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-sync/default.nix
index 7ba7d8ec2434..7ba7d8ec2434 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 1150f008299c..1150f008299c 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/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix
index 3acfd4bc4001..3acfd4bc4001 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 f8f8ab86a9ce..f8f8ab86a9ce 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 9603d8e27c5c..9603d8e27c5c 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 721f2aa099c4..721f2aa099c4 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 4b73d11744ba..4b73d11744ba 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 71cdc694ac31..71cdc694ac31 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 05944014743f..05944014743f 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 036f8b4114e2..036f8b4114e2 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 6ecf81779f20..6ecf81779f20 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 26f9f8c756ee..26f9f8c756ee 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 1de631e8b6ad..1de631e8b6ad 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 22f35e22fb54..22f35e22fb54 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 a98dd5bc5862..a98dd5bc5862 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 b7828418db07..b7828418db07 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 44e4b5de9569..44e4b5de9569 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 a1ef489b0073..a1ef489b0073 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/pass-git-helper/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix
index d0d60b193437..d0d60b193437 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/pre-commit/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix
index ed44043eb9a9..ed44043eb9a9 100644
--- a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/pre-commit/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 06c8bb8cb2dd..06c8bb8cb2dd 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 4f9a1c4e5442..4f9a1c4e5442 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 a129e0f75272..a129e0f75272 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 34c367b20a43..34c367b20a43 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 d00fdd0c29e0..d00fdd0c29e0 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/tig/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/tig/default.nix
index e9862cb48975..e9862cb48975 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 c183bbde7e6b..c183bbde7e6b 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 cea588f76ca2..cea588f76ca2 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 925aadab3dd5..925aadab3dd5 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-crecord/default.nix b/nixpkgs/pkgs/applications/version-management/git-crecord/default.nix
index fd999dc17d4d..fd999dc17d4d 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 3cde046a2adf..3cde046a2adf 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 92ba57382501..92ba57382501 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 04ae45f75b39..04ae45f75b39 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 ecc054df47e7..ecc054df47e7 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 9c5ab20d364f..9c5ab20d364f 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 45c97868c4bf..45c97868c4bf 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 748e473be3dd..748e473be3dd 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 7c36afdff84c..7c36afdff84c 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 2428c6cebddd..2428c6cebddd 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 12d22e2cc3ca..12d22e2cc3ca 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 5afb8c8ee5d2..5afb8c8ee5d2 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 6ac1a9d68616..6ac1a9d68616 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/gitaly/Gemfile b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile
index c111744a1a18..c111744a1a18 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 fec103a23a40..fec103a23a40 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 fc10c59df94f..fc10c59df94f 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/gemset.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
index 9b0f37e36bce..9b0f37e36bce 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 be0cf838f908..be0cf838f908 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/remove-hardcoded-locations.patch b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
index 9b5efeaee801..9b5efeaee801 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 a98c41699c75..a98c41699c75 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/remove-hardcoded-locations.patch b/nixpkgs/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
index 7a2bfea0c109..7a2bfea0c109 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 705b5830edfc..705b5830edfc 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-ce/Gemfile b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
index 00f90bdf7e3a..00f90bdf7e3a 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
+++ b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
index d498172b02d3..d498172b02d3 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
+++ b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
index c24dc185be7a..c24dc185be7a 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
+++ b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
index 52e802ef524d..52e802ef524d 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
+++ b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
index 72bc2c473405..72bc2c473405 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
+++ b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
index bbf769314a3f..bbf769314a3f 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
+++ b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
diff --git a/pkgs/applications/version-management/gitlab/update.py b/nixpkgs/pkgs/applications/version-management/gitlab/update.py
index 0ec743cb67d7..0ec743cb67d7 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/gitless/default.nix b/nixpkgs/pkgs/applications/version-management/gitless/default.nix
index c08e441b05af..c08e441b05af 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 42c091007884..42c091007884 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 64b6e2107f6a..64b6e2107f6a 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 0587bc9af767..0587bc9af767 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 9eaa72a0c85d..9eaa72a0c85d 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 0d2c4d742672..0d2c4d742672 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 33d2eb89ad08..33d2eb89ad08 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 f0e924cbfb81..f0e924cbfb81 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 168827c3548f..168827c3548f 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/default.nix b/nixpkgs/pkgs/applications/version-management/mercurial/default.nix
index 7f72e24aa537..7f72e24aa537 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 3c052a26cdee..3c052a26cdee 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 73acc3a6b36f..73acc3a6b36f 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 010d4d2f86ad..010d4d2f86ad 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 e0d01fb190c6..e0d01fb190c6 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 1ecda436c251..1ecda436c251 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 8150203814d0..8150203814d0 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 18fb672226f2..18fb672226f2 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 8fb1095dc581..8fb1095dc581 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 f82b80067bf2..f82b80067bf2 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 8b68dddfceb4..8b68dddfceb4 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 180664d33863..180664d33863 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 d3b027fada68..d3b027fada68 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 e799d5fac43b..e799d5fac43b 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 ca4bc394c2c6..ca4bc394c2c6 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 862b9eacd628..862b9eacd628 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 745f1868a369..745f1868a369 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/4.x/Gemfile b/nixpkgs/pkgs/applications/version-management/redmine/4.x/Gemfile
index 343c7b3a5470..343c7b3a5470 100644
--- a/pkgs/applications/version-management/redmine/4.x/Gemfile
+++ b/nixpkgs/pkgs/applications/version-management/redmine/4.x/Gemfile
diff --git a/pkgs/applications/version-management/redmine/4.x/Gemfile.lock b/nixpkgs/pkgs/applications/version-management/redmine/4.x/Gemfile.lock
index 671d2bb4ac1f..671d2bb4ac1f 100644
--- a/pkgs/applications/version-management/redmine/4.x/Gemfile.lock
+++ b/nixpkgs/pkgs/applications/version-management/redmine/4.x/Gemfile.lock
diff --git a/pkgs/applications/version-management/redmine/4.x/default.nix b/nixpkgs/pkgs/applications/version-management/redmine/4.x/default.nix
index 1fbc22f87761..1fbc22f87761 100644
--- a/pkgs/applications/version-management/redmine/4.x/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/redmine/4.x/default.nix
diff --git a/pkgs/applications/version-management/redmine/4.x/gemset.nix b/nixpkgs/pkgs/applications/version-management/redmine/4.x/gemset.nix
index 34e459111f8a..34e459111f8a 100644
--- a/pkgs/applications/version-management/redmine/4.x/gemset.nix
+++ b/nixpkgs/pkgs/applications/version-management/redmine/4.x/gemset.nix
diff --git a/pkgs/applications/version-management/redmine/Gemfile b/nixpkgs/pkgs/applications/version-management/redmine/Gemfile
index 5a0283e20ed5..5a0283e20ed5 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 21296d343b44..21296d343b44 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 ba1980c3d142..ba1980c3d142 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 4ef4bd404270..4ef4bd404270 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 8dd46405d31f..8dd46405d31f 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 0a659c93406d..0a659c93406d 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 7d655bfc5d3b..7d655bfc5d3b 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 38c3da220c92..38c3da220c92 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/smartgithg/install_freedesktop_items.sh b/nixpkgs/pkgs/applications/version-management/smartgithg/install_freedesktop_items.sh
index 2ff14dcf0993..2ff14dcf0993 100755
--- a/pkgs/applications/version-management/smartgithg/install_freedesktop_items.sh
+++ b/nixpkgs/pkgs/applications/version-management/smartgithg/install_freedesktop_items.sh
diff --git a/pkgs/applications/version-management/src/default.nix b/nixpkgs/pkgs/applications/version-management/src/default.nix
index 049f2756a551..049f2756a551 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 8753d4f6f571..8753d4f6f571 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 7cd596d9ea78..7cd596d9ea78 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 f69fdbefe184..f69fdbefe184 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 da973b0a7ee1..da973b0a7ee1 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 240d94f3f977..240d94f3f977 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 81949f951069..81949f951069 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 c68cc928848d..c68cc928848d 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 48558c15dc1c..48558c15dc1c 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 2cca53d6fe76..2cca53d6fe76 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 c2bf0a4183c1..c2bf0a4183c1 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 4089e68d85dc..4089e68d85dc 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 6baeb5279c26..6baeb5279c26 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 3df616824801..3df616824801 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 8f45251d26c2..8f45251d26c2 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 7912fe60bbc8..7912fe60bbc8 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 803cde02ec2e..803cde02ec2e 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 a76608bdd900..a76608bdd900 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 d98b39796608..d98b39796608 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 4b97db56e978..4b97db56e978 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 bbac10140344..bbac10140344 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 aeaa195798a4..aeaa195798a4 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 ea8cb5aa3ffa..ea8cb5aa3ffa 100644
--- a/pkgs/applications/video/byzanz/default.nix
+++ b/nixpkgs/pkgs/applications/video/byzanz/default.nix
diff --git a/pkgs/applications/video/cinelerra/default.nix b/nixpkgs/pkgs/applications/video/cinelerra/default.nix
index eb3946b9ed03..eb3946b9ed03 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 34c80e1050b4..34c80e1050b4 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 9b29e18d0bc4..9b29e18d0bc4 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 10a8f4019fca..10a8f4019fca 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 4802d259fb23..4802d259fb23 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 a032ef654aa3..a032ef654aa3 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 344c47eb934a..344c47eb934a 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 c15a892e6981..c15a892e6981 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 786f0c968556..786f0c968556 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 5f77a68081a4..5f77a68081a4 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 52b6cc44cd59..52b6cc44cd59 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 4712dfac7573..4712dfac7573 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 f73c5277d054..f73c5277d054 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 fd8cc8d86306..fd8cc8d86306 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 ede4991c4662..ede4991c4662 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/gnome-mpv/default.nix b/nixpkgs/pkgs/applications/video/gnome-mpv/default.nix
index a04eebfcc407..a04eebfcc407 100644
--- a/pkgs/applications/video/gnome-mpv/default.nix
+++ b/nixpkgs/pkgs/applications/video/gnome-mpv/default.nix
diff --git a/pkgs/applications/video/gnomecast/default.nix b/nixpkgs/pkgs/applications/video/gnomecast/default.nix
index d840f43163cf..d840f43163cf 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 7a8b66d2d28e..7a8b66d2d28e 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 aa2407134f38..aa2407134f38 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 1e8883eae7ff..1e8883eae7ff 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 d0c9c2a8035e..d0c9c2a8035e 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 9d549c2aecc3..9d549c2aecc3 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 43e360830ab5..43e360830ab5 100644
--- a/pkgs/applications/video/kazam/fix-paths.patch
+++ b/nixpkgs/pkgs/applications/video/kazam/fix-paths.patch
diff --git a/pkgs/applications/video/key-mon/default.nix b/nixpkgs/pkgs/applications/video/key-mon/default.nix
index bc6cd015b865..bc6cd015b865 100644
--- a/pkgs/applications/video/key-mon/default.nix
+++ b/nixpkgs/pkgs/applications/video/key-mon/default.nix
diff --git a/pkgs/applications/video/kino/default.nix b/nixpkgs/pkgs/applications/video/kino/default.nix
index 4ddd84433e88..4ddd84433e88 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 65c5bc38276d..65c5bc38276d 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 f98cbda0bc49..f98cbda0bc49 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 d6a8953cf00a..d6a8953cf00a 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 05ec7386709e..05ec7386709e 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 44313f9499f5..44313f9499f5 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 9b6652b0be58..9b6652b0be58 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 c93453f908c9..c93453f908c9 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 e5844eb827df..e5844eb827df 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 1cb510780691..1cb510780691 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 6a0b1cbdf739..6a0b1cbdf739 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 62d5d0c0d4c0..62d5d0c0d4c0 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 6d74c64343d8..6d74c64343d8 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 717853af745c..717853af745c 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 caab48d0e2d9..caab48d0e2d9 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 8287a176ce63..8287a176ce63 100644
--- a/pkgs/applications/video/lxdvdrip/default.nix
+++ b/nixpkgs/pkgs/applications/video/lxdvdrip/default.nix
diff --git a/pkgs/applications/video/makemkv/builder.sh b/nixpkgs/pkgs/applications/video/makemkv/builder.sh
index 416d5c0f0b07..416d5c0f0b07 100644
--- a/pkgs/applications/video/makemkv/builder.sh
+++ b/nixpkgs/pkgs/applications/video/makemkv/builder.sh
diff --git a/pkgs/applications/video/makemkv/default.nix b/nixpkgs/pkgs/applications/video/makemkv/default.nix
index f9b5c4c01965..f9b5c4c01965 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 4dd2e019d1d3..4dd2e019d1d3 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 cceed556f978..cceed556f978 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 3b8dce90243b..3b8dce90243b 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 70dc156d6802..70dc156d6802 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 4a3cbc81b35e..4a3cbc81b35e 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 c13bf3480d25..c13bf3480d25 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 e3dcf6b3d3b3..e3dcf6b3d3b3 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 81b48e25b96b..81b48e25b96b 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 c77486a30cf1..c77486a30cf1 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 dcfeae52aae4..dcfeae52aae4 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 faa21326fc0e..faa21326fc0e 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 82171210b415..82171210b415 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 778dc52d96a1..778dc52d96a1 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 624c06414fd3..624c06414fd3 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 74167a67bd2b..74167a67bd2b 100644
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/nixpkgs/pkgs/applications/video/mythtv/default.nix
diff --git a/pkgs/applications/video/natron/config.pri b/nixpkgs/pkgs/applications/video/natron/config.pri
index c0d236c6b975..c0d236c6b975 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 6299cd7e5937..6299cd7e5937 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 0990062bf022..0990062bf022 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/linuxbrowser.nix b/nixpkgs/pkgs/applications/video/obs-studio/linuxbrowser.nix
index 14f40ad8901f..14f40ad8901f 100644
--- a/pkgs/applications/video/obs-studio/linuxbrowser.nix
+++ b/nixpkgs/pkgs/applications/video/obs-studio/linuxbrowser.nix
diff --git a/pkgs/applications/video/ogmtools/default.nix b/nixpkgs/pkgs/applications/video/ogmtools/default.nix
index 221f4fc0e5c3..221f4fc0e5c3 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 15db28b05e46..15db28b05e46 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 7a130bbdb418..7a130bbdb418 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 19a8ff6c822e..19a8ff6c822e 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 9bf211164553..9bf211164553 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 b7c8e6feeba4..b7c8e6feeba4 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 d9eef7f4cd85..d9eef7f4cd85 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 374ea08816f7..374ea08816f7 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 1c124df30238..1c124df30238 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 0025ecd0a4cf..0025ecd0a4cf 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 9f5401fc69c3..9f5401fc69c3 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 af9ef4c1cd50..af9ef4c1cd50 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 f0c3776a4336..f0c3776a4336 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 160066688462..160066688462 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 f2b23fbdea03..f2b23fbdea03 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 c3204cc9c0ce..c3204cc9c0ce 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 603534be4c8b..603534be4c8b 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 333f4e6ab4de..333f4e6ab4de 100644
--- a/pkgs/applications/video/quvi/tool.nix
+++ b/nixpkgs/pkgs/applications/video/quvi/tool.nix
diff --git a/pkgs/applications/video/recordmydesktop/default.nix b/nixpkgs/pkgs/applications/video/recordmydesktop/default.nix
index 8797ad8f953b..8797ad8f953b 100644
--- a/pkgs/applications/video/recordmydesktop/default.nix
+++ b/nixpkgs/pkgs/applications/video/recordmydesktop/default.nix
diff --git a/pkgs/applications/video/recordmydesktop/gtk.nix b/nixpkgs/pkgs/applications/video/recordmydesktop/gtk.nix
index 984b623cee7e..984b623cee7e 100644
--- a/pkgs/applications/video/recordmydesktop/gtk.nix
+++ b/nixpkgs/pkgs/applications/video/recordmydesktop/gtk.nix
diff --git a/pkgs/applications/video/recordmydesktop/qt.nix b/nixpkgs/pkgs/applications/video/recordmydesktop/qt.nix
index 560801351515..560801351515 100644
--- a/pkgs/applications/video/recordmydesktop/qt.nix
+++ b/nixpkgs/pkgs/applications/video/recordmydesktop/qt.nix
diff --git a/pkgs/applications/video/screenkey/default.nix b/nixpkgs/pkgs/applications/video/screenkey/default.nix
index 1671c3f14d00..1671c3f14d00 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 7e5ed47fc19d..7e5ed47fc19d 100644
--- a/pkgs/applications/video/screenkey/paths.patch
+++ b/nixpkgs/pkgs/applications/video/screenkey/paths.patch
diff --git a/pkgs/applications/video/shotcut/default.nix b/nixpkgs/pkgs/applications/video/shotcut/default.nix
index 27a0fa3388ed..27a0fa3388ed 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 b456d8ee9a66..b456d8ee9a66 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 ba02240ce1f2..ba02240ce1f2 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 00a0942ccf6f..00a0942ccf6f 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 41f82a8bdd5c..41f82a8bdd5c 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 79f092a882c7..79f092a882c7 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 32bd731f16e9..32bd731f16e9 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 ea51471d9aa4..ea51471d9aa4 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 83ca41e201c9..83ca41e201c9 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 dd595baa52e8..dd595baa52e8 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 e81002193589..e81002193589 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 022f4382a492..022f4382a492 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 497ad7c77a08..497ad7c77a08 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 98fcd2b5d408..98fcd2b5d408 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 e9fc0b4feda3..e9fc0b4feda3 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 e609c1cd3395..e609c1cd3395 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 afcee3f9715f..afcee3f9715f 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 2bf74da3d0f2..2bf74da3d0f2 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 086190000ab4..086190000ab4 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 d52a4a6ab9b9..d52a4a6ab9b9 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 64fcf0ba04a5..64fcf0ba04a5 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 db9a5ce7850b..db9a5ce7850b 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 4d3d88d5be8d..4d3d88d5be8d 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 ae048f1bdac4..ae048f1bdac4 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 6e07fbb105b6..6e07fbb105b6 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 eb97854386b2..eb97854386b2 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 7cff2589abe0..7cff2589abe0 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 15d98dc9be50..15d98dc9be50 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 c858f4c4d6d3..c858f4c4d6d3 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 e7cd5b7bde68..e7cd5b7bde68 100644
--- a/pkgs/applications/virtualization/aqemu/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/aqemu/default.nix
diff --git a/pkgs/applications/virtualization/bochs/bochs-2.6.9-glibc-2.26.patch b/nixpkgs/pkgs/applications/virtualization/bochs/bochs-2.6.9-glibc-2.26.patch
index a13b42ee35a3..a13b42ee35a3 100644
--- a/pkgs/applications/virtualization/bochs/bochs-2.6.9-glibc-2.26.patch
+++ b/nixpkgs/pkgs/applications/virtualization/bochs/bochs-2.6.9-glibc-2.26.patch
diff --git a/pkgs/applications/virtualization/bochs/default.nix b/nixpkgs/pkgs/applications/virtualization/bochs/default.nix
index f9d7128330fb..f9d7128330fb 100644
--- a/pkgs/applications/virtualization/bochs/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/bochs/default.nix
diff --git a/pkgs/applications/virtualization/cbfstool/default.nix b/nixpkgs/pkgs/applications/virtualization/cbfstool/default.nix
index 13060a50290b..13060a50290b 100644
--- a/pkgs/applications/virtualization/cbfstool/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/cbfstool/default.nix
diff --git a/pkgs/applications/virtualization/charliecloud/default.nix b/nixpkgs/pkgs/applications/virtualization/charliecloud/default.nix
index c55eb342e069..c55eb342e069 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 23084c6286a4..23084c6286a4 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 eb143412bd40..eb143412bd40 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 d21bc8cc32b5..d21bc8cc32b5 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 8070e1423fe8..8070e1423fe8 100644
--- a/pkgs/applications/virtualization/cri-o/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix
diff --git a/pkgs/applications/virtualization/docker-compose/default.nix b/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix
index 2d983d009f1d..2d983d009f1d 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 384ab8f30473..384ab8f30473 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 0af9abc852ef..0af9abc852ef 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 dcac628e3676..dcac628e3676 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 3b2e1f45ae64..3b2e1f45ae64 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 069d5836a42b..069d5836a42b 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 1fa3e76d18fd..1fa3e76d18fd 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 39ca93d4e1a8..39ca93d4e1a8 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 2b2d8568a5b7..2b2d8568a5b7 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 946014e5cc9a..946014e5cc9a 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/dynamips/default.nix b/nixpkgs/pkgs/applications/virtualization/dynamips/default.nix
index 9419939d1c74..9419939d1c74 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 ab971fe64c98..ab971fe64c98 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 45ec7383fc87..45ec7383fc87 100644
--- a/pkgs/applications/virtualization/firecracker/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/firecracker/default.nix
diff --git a/pkgs/applications/virtualization/lkl/default.nix b/nixpkgs/pkgs/applications/virtualization/lkl/default.nix
index 318929eb2253..318929eb2253 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 afb2088c6a6e..afb2088c6a6e 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 bbd166995f36..bbd166995f36 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 197b3045cf27..197b3045cf27 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 043c1efade8a..043c1efade8a 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 46b8e3ba43c3..46b8e3ba43c3 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 200542f4de84..200542f4de84 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 46d8ea7f7f3f..46d8ea7f7f3f 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/default.nix b/nixpkgs/pkgs/applications/virtualization/podman/default.nix
index b07365a5ca11..b07365a5ca11 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 0678591fc2a3..0678591fc2a3 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 03e47a57863c..03e47a57863c 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 d64baca2cc7e..d64baca2cc7e 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 c2f051e2b944..c2f051e2b944 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 33c4ffff6fe5..33c4ffff6fe5 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 37c12ddbfeb7..37c12ddbfeb7 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 41050447ac64..41050447ac64 100644
--- a/pkgs/applications/virtualization/qemu/sigrtminmax.patch
+++ b/nixpkgs/pkgs/applications/virtualization/qemu/sigrtminmax.patch
diff --git a/pkgs/applications/virtualization/railcar/cargo-lock.patch b/nixpkgs/pkgs/applications/virtualization/railcar/cargo-lock.patch
index bb9d5420f32a..bb9d5420f32a 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 0a139448cb3a..0a139448cb3a 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 8777f7cc2db2..8777f7cc2db2 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 0f53ede188ce..0f53ede188ce 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 10c7d17209c3..10c7d17209c3 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 5aa73528e9d7..5aa73528e9d7 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 8ec9ec6c8b49..8ec9ec6c8b49 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 fe51488c7066..fe51488c7066 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 70ae09aa6ef8..70ae09aa6ef8 100644
--- a/pkgs/applications/virtualization/spice-vdagent/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/spice-vdagent/default.nix
diff --git a/pkgs/applications/virtualization/tini/default.nix b/nixpkgs/pkgs/applications/virtualization/tini/default.nix
index 25c19cd79c7f..25c19cd79c7f 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 a8f113307251..a8f113307251 100644
--- a/pkgs/applications/virtualization/tinyemu/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/tinyemu/default.nix
diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix
index 392517e3ab26..392517e3ab26 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 c1dbad94250a..c1dbad94250a 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 493307d0d078..493307d0d078 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 7c90f9b3483f..7c90f9b3483f 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 8a339ac83224..8a339ac83224 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 8222fb50a8f9..8222fb50a8f9 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 b36d918a803f..b36d918a803f 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 78c2538bbb0e..78c2538bbb0e 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 5ff8a1650bab..5ff8a1650bab 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 398100f3f398..398100f3f398 100644
--- a/pkgs/applications/virtualization/virtualbox/hardened.patch
+++ b/nixpkgs/pkgs/applications/virtualization/virtualbox/hardened.patch
diff --git a/pkgs/applications/virtualization/virtualbox/qtx11extras.patch b/nixpkgs/pkgs/applications/virtualization/virtualbox/qtx11extras.patch
index a3aa98b081d1..a3aa98b081d1 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 6e8bfd5c8250..6e8bfd5c8250 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 3d6efcfc8443..3d6efcfc8443 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 d94a39ccd64d..d94a39ccd64d 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 94682893d51c..94682893d51c 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 53821c0d9c51..53821c0d9c51 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 072338b87aba..072338b87aba 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 339972a2cdeb..339972a2cdeb 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 67b7ac777b5d..67b7ac777b5d 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 acf9cff99251..acf9cff99251 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 1771b662bc3a..1771b662bc3a 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 f3055fc79c35..f3055fc79c35 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.5.nix b/nixpkgs/pkgs/applications/virtualization/xen/4.5.nix
index 64704f73e7b1..64704f73e7b1 100644
--- a/pkgs/applications/virtualization/xen/4.5.nix
+++ b/nixpkgs/pkgs/applications/virtualization/xen/4.5.nix
diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/nixpkgs/pkgs/applications/virtualization/xen/4.8.nix
index 2a59cd1f0615..2a59cd1f0615 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 aa4fd494082d..aa4fd494082d 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 8dc2dffc6b6b..8dc2dffc6b6b 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 791a3b91818a..791a3b91818a 100644
--- a/pkgs/applications/virtualization/xen/packages.nix
+++ b/nixpkgs/pkgs/applications/virtualization/xen/packages.nix
diff --git a/pkgs/applications/virtualization/xen/xsa-patches.nix b/nixpkgs/pkgs/applications/virtualization/xen/xsa-patches.nix
index 727546b69fb0..727546b69fb0 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 d3990a70bcac..d3990a70bcac 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 116180f5ec36..116180f5ec36 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 46a86da1d66b..46a86da1d66b 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 25438c816055..25438c816055 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 582f9cb61f8e..582f9cb61f8e 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 7cb423123dc6..7cb423123dc6 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 09c7c8e0e088..09c7c8e0e088 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 f55c55110a29..f55c55110a29 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 a893d40e2107..a893d40e2107 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/clfswm/default.nix b/nixpkgs/pkgs/applications/window-managers/clfswm/default.nix
index cc00f1e4b6e9..cc00f1e4b6e9 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 ae2234461d25..ae2234461d25 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/compton/default.nix b/nixpkgs/pkgs/applications/window-managers/compton/default.nix
index e729f786a566..e729f786a566 100644
--- a/pkgs/applications/window-managers/compton/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/compton/default.nix
diff --git a/pkgs/applications/window-managers/cwm/default.nix b/nixpkgs/pkgs/applications/window-managers/cwm/default.nix
index 0b611906a466..0b611906a466 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 af2c9af900dc..af2c9af900dc 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 734d70598fb0..734d70598fb0 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 aaa32dd6b11b..aaa32dd6b11b 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 7bc76d5c2bfb..7bc76d5c2bfb 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 1907fbb68f98..1907fbb68f98 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 0c13691a36ac..0c13691a36ac 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 c92b70153a72..c92b70153a72 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 20a95f36cee3..20a95f36cee3 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 ca64786475f7..ca64786475f7 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 83fe3ef163a3..83fe3ef163a3 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 bd088db8a366..bd088db8a366 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 bef38e7a72ab..bef38e7a72ab 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 9ce5486557a5..9ce5486557a5 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 f2dc023c81d6..f2dc023c81d6 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 54f238317068..54f238317068 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 afa14b48451a..afa14b48451a 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 fa88a7e26bef..fa88a7e26bef 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 f6d797c98e1e..f6d797c98e1e 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 27d568ae9ede..27d568ae9ede 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 20ea0dd03cc3..20ea0dd03cc3 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 2fd78cbb0e12..2fd78cbb0e12 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 17b147da1b2f..17b147da1b2f 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 5b1cdbe05f5d..5b1cdbe05f5d 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 b0012c587f6a..b0012c587f6a 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 8406736541c0..8406736541c0 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/icewm/fix-strlcat_strlcpy.patch b/nixpkgs/pkgs/applications/window-managers/icewm/fix-strlcat_strlcpy.patch
index 9721e125b051..9721e125b051 100644
--- a/pkgs/applications/window-managers/icewm/fix-strlcat_strlcpy.patch
+++ b/nixpkgs/pkgs/applications/window-managers/icewm/fix-strlcat_strlcpy.patch
diff --git a/pkgs/applications/window-managers/icewm/musl.patch b/nixpkgs/pkgs/applications/window-managers/icewm/musl.patch
index e7d18e312874..e7d18e312874 100644
--- a/pkgs/applications/window-managers/icewm/musl.patch
+++ b/nixpkgs/pkgs/applications/window-managers/icewm/musl.patch
diff --git a/pkgs/applications/window-managers/ion-3/default.nix b/nixpkgs/pkgs/applications/window-managers/ion-3/default.nix
index c13b950599ed..c13b950599ed 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 6a7c1436b09d..6a7c1436b09d 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 3b764e7095be..3b764e7095be 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 08b79927d21e..08b79927d21e 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 4ec1a4bcd059..4ec1a4bcd059 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 92588eb2fdb9..92588eb2fdb9 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 574e42cc8481..574e42cc8481 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 ed34e75f35db..ed34e75f35db 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 a1334112cf98..a1334112cf98 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 9abbd891e310..9abbd891e310 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 722566ea2e9e..722566ea2e9e 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 eaeb9979c10c..eaeb9979c10c 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/notion/notion-xft_nixos.diff b/nixpkgs/pkgs/applications/window-managers/notion/notion-xft_nixos.diff
index 542aa446c3f2..542aa446c3f2 100644
--- a/pkgs/applications/window-managers/notion/notion-xft_nixos.diff
+++ b/nixpkgs/pkgs/applications/window-managers/notion/notion-xft_nixos.diff
diff --git a/pkgs/applications/window-managers/openbox/default.nix b/nixpkgs/pkgs/applications/window-managers/openbox/default.nix
index 8c6926dd2c69..8c6926dd2c69 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/orbment/bemenu.nix b/nixpkgs/pkgs/applications/window-managers/orbment/bemenu.nix
index 065b81948c2d..065b81948c2d 100644
--- a/pkgs/applications/window-managers/orbment/bemenu.nix
+++ b/nixpkgs/pkgs/applications/window-managers/orbment/bemenu.nix
diff --git a/pkgs/applications/window-managers/orbment/default.nix b/nixpkgs/pkgs/applications/window-managers/orbment/default.nix
index 6bf6f44d4234..6bf6f44d4234 100644
--- a/pkgs/applications/window-managers/orbment/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/orbment/default.nix
diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/nixpkgs/pkgs/applications/window-managers/oroborus/default.nix
index 00ff62520105..00ff62520105 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 b2677218e856..b2677218e856 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/qtile/0001-Substitution-vars-for-absolute-paths.patch b/nixpkgs/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch
index 219d6dcbe207..219d6dcbe207 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 a01f14062f1d..a01f14062f1d 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 87fd19773794..87fd19773794 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 dc78702b03c5..dc78702b03c5 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 0a1a095e0ced..0a1a095e0ced 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 887a58b748da..887a58b748da 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 81901be0e60b..81901be0e60b 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 64fa600765b3..64fa600765b3 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 56d2515ed7b2..56d2515ed7b2 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 d18392037015..d18392037015 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 3ed7f4325f24..3ed7f4325f24 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 79bfaad3dec3..79bfaad3dec3 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 d68cacf666fe..d68cacf666fe 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 7d5c4c05131d..9fe09ca3241b 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/sway/default.nix
@@ -1,9 +1,11 @@
-{ stdenv, fetchFromGitHub, makeWrapper
+{ stdenv, lib, fetchFromGitHub, makeWrapper
 , meson, ninja
 , pkgconfig, scdoc
-, wayland, libxkbcommon, pcre, json_c, dbus, libevdev
-, pango, cairo, libinput, libcap, pam, gdk_pixbuf
+, wayland, libxkbcommon, pcre, json_c, libevdev, pango, cairo, libinput
 , wlroots, wayland-protocols, swaybg
+
+, gdkPixbufSupport ? true, gdk_pixbuf
+, xwaylandSupport ? lib.elem "-Dxwayland=enabled" wlroots.mesonFlags
 }:
 
 stdenv.mkDerivation rec {
@@ -25,17 +27,16 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig meson ninja scdoc makeWrapper ];
 
   buildInputs = [
-    wayland libxkbcommon pcre json_c dbus libevdev
-    pango cairo libinput libcap pam gdk_pixbuf
+    wayland libxkbcommon pcre json_c libevdev pango cairo libinput
     wlroots wayland-protocols
-  ];
+  ] ++ lib.optional gdkPixbufSupport gdk_pixbuf;
 
   enableParallelBuilding = true;
 
-  mesonFlags = [
-    "-Ddefault-wallpaper=false" "-Dxwayland=enabled" "-Dgdk-pixbuf=enabled"
-    "-Dtray=enabled" "-Dman-pages=enabled"
-  ];
+  mesonFlags =
+    [ "-Ddefault-wallpaper=false" "-Dtray=enabled" "-Dman-pages=enabled" ]
+    ++ lib.optional gdkPixbufSupport "-Dgdk-pixbuf=enabled"
+    ++ lib.optional xwaylandSupport "-Dxwayland=enabled";
 
   postInstall = ''
     wrapProgram $out/bin/sway --prefix PATH : "${swaybg}/bin"
@@ -45,7 +46,7 @@ stdenv.mkDerivation rec {
     sed -i "s/version: '1.0'/version: '${version}'/" meson.build
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "i3-compatible tiling Wayland compositor";
     homepage    = https://swaywm.org;
     license     = licenses.mit;
diff --git a/pkgs/applications/window-managers/sway/idle.nix b/nixpkgs/pkgs/applications/window-managers/sway/idle.nix
index 0f3e2205bd97..0f3e2205bd97 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 26a3d40d66cb..26a3d40d66cb 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.nix b/nixpkgs/pkgs/applications/window-managers/sway/lock.nix
index a7505e141688..a7505e141688 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 009c12959430..009c12959430 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/sxhkd/default.nix b/nixpkgs/pkgs/applications/window-managers/sxhkd/default.nix
index 2e58928e34c8..2e58928e34c8 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 0943881da28f..0943881da28f 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 681a5baec82c..681a5baec82c 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 5aec0973a7c6..5aec0973a7c6 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/velox/default.nix b/nixpkgs/pkgs/applications/window-managers/velox/default.nix
index f8cb6c266839..f8cb6c266839 100644
--- a/pkgs/applications/window-managers/velox/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/velox/default.nix
diff --git a/pkgs/applications/window-managers/velox/dmenu.nix b/nixpkgs/pkgs/applications/window-managers/velox/dmenu.nix
index 01360e5af0b3..01360e5af0b3 100644
--- a/pkgs/applications/window-managers/velox/dmenu.nix
+++ b/nixpkgs/pkgs/applications/window-managers/velox/dmenu.nix
diff --git a/pkgs/applications/window-managers/velox/st.nix b/nixpkgs/pkgs/applications/window-managers/velox/st.nix
index 2d73df650463..2d73df650463 100644
--- a/pkgs/applications/window-managers/velox/st.nix
+++ b/nixpkgs/pkgs/applications/window-managers/velox/st.nix
diff --git a/pkgs/applications/window-managers/velox/swc.nix b/nixpkgs/pkgs/applications/window-managers/velox/swc.nix
index a2f98b8b65e7..a2f98b8b65e7 100644
--- a/pkgs/applications/window-managers/velox/swc.nix
+++ b/nixpkgs/pkgs/applications/window-managers/velox/swc.nix
diff --git a/pkgs/applications/window-managers/velox/wld.nix b/nixpkgs/pkgs/applications/window-managers/velox/wld.nix
index d85f8212ec47..d85f8212ec47 100644
--- a/pkgs/applications/window-managers/velox/wld.nix
+++ b/nixpkgs/pkgs/applications/window-managers/velox/wld.nix
diff --git a/pkgs/applications/window-managers/vwm/default.nix b/nixpkgs/pkgs/applications/window-managers/vwm/default.nix
index 3423b0e181d5..3423b0e181d5 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/way-cooler/bar.diff b/nixpkgs/pkgs/applications/window-managers/way-cooler/bar.diff
index e60ebabe9833..e60ebabe9833 100644
--- a/pkgs/applications/window-managers/way-cooler/bar.diff
+++ b/nixpkgs/pkgs/applications/window-managers/way-cooler/bar.diff
diff --git a/pkgs/applications/window-managers/way-cooler/crates-io.nix b/nixpkgs/pkgs/applications/window-managers/way-cooler/crates-io.nix
index 9dbd367a67f3..9dbd367a67f3 100644
--- a/pkgs/applications/window-managers/way-cooler/crates-io.nix
+++ b/nixpkgs/pkgs/applications/window-managers/way-cooler/crates-io.nix
diff --git a/pkgs/applications/window-managers/way-cooler/default.nix b/nixpkgs/pkgs/applications/window-managers/way-cooler/default.nix
index 24320ff0073b..24320ff0073b 100644
--- a/pkgs/applications/window-managers/way-cooler/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/way-cooler/default.nix
diff --git a/pkgs/applications/window-managers/way-cooler/way-cooler.nix b/nixpkgs/pkgs/applications/window-managers/way-cooler/way-cooler.nix
index 28a327f1c137..28a327f1c137 100644
--- a/pkgs/applications/window-managers/way-cooler/way-cooler.nix
+++ b/nixpkgs/pkgs/applications/window-managers/way-cooler/way-cooler.nix
diff --git a/pkgs/applications/window-managers/way-cooler/wc-bg.nix b/nixpkgs/pkgs/applications/window-managers/way-cooler/wc-bg.nix
index 4d527715c5f2..4d527715c5f2 100644
--- a/pkgs/applications/window-managers/way-cooler/wc-bg.nix
+++ b/nixpkgs/pkgs/applications/window-managers/way-cooler/wc-bg.nix
diff --git a/pkgs/applications/window-managers/way-cooler/wc-grab.nix b/nixpkgs/pkgs/applications/window-managers/way-cooler/wc-grab.nix
index 6f936eb2e432..6f936eb2e432 100644
--- a/pkgs/applications/window-managers/way-cooler/wc-grab.nix
+++ b/nixpkgs/pkgs/applications/window-managers/way-cooler/wc-grab.nix
diff --git a/pkgs/applications/window-managers/way-cooler/wc-lock.nix b/nixpkgs/pkgs/applications/window-managers/way-cooler/wc-lock.nix
index 1b9e3df3508e..1b9e3df3508e 100644
--- a/pkgs/applications/window-managers/way-cooler/wc-lock.nix
+++ b/nixpkgs/pkgs/applications/window-managers/way-cooler/wc-lock.nix
diff --git a/pkgs/applications/window-managers/weston/default.nix b/nixpkgs/pkgs/applications/window-managers/weston/default.nix
index a88281369e8f..a88281369e8f 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 caf97c6510de..caf97c6510de 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 d83c4493accb..d83c4493accb 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 e708682e3036..e708682e3036 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 e2f17d11f64d..e2f17d11f64d 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 3e8b3f7f1584..3e8b3f7f1584 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 e5eb2fc559da..e5eb2fc559da 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 d615b4fe010c..d615b4fe010c 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 5a8b68df364a..5a8b68df364a 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 60d3e61fdf96..60d3e61fdf96 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 f7ccda273890..f7ccda273890 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 5e1fc7114dc8..5e1fc7114dc8 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 f5c9f12a23f6..f5c9f12a23f6 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 6fc1797dd251..6fc1797dd251 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 a33a75676ee9..a33a75676ee9 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 47c8f6c5e568..47c8f6c5e568 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 5cab0937e074..5cab0937e074 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 e556e7ead2a7..e556e7ead2a7 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 16fe748c3e5c..16fe748c3e5c 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 990f1ce2e3e3..990f1ce2e3e3 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 e5c0556556c7..e5c0556556c7 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 b7180870860a..b7180870860a 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 e1ec09bc95a1..e1ec09bc95a1 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 5d81e34a047f..5d81e34a047f 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 ed2f00a8974e..ed2f00a8974e 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 71b9471cbc83..71b9471cbc83 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 f65b792485a0..f65b792485a0 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 7c9fc83e0f1b..7c9fc83e0f1b 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 f36c69e43392..f36c69e43392 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 dcb2e97aa932..dcb2e97aa932 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 70a7a43bd398..70a7a43bd398 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 6d0770a0dc4a..6d0770a0dc4a 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 707b256cd4b4..707b256cd4b4 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 295b17eec67c..295b17eec67c 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 f47e3ebc61c2..f47e3ebc61c2 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 a1030e3b34fa..a1030e3b34fa 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 bc6482f0a88e..bc6482f0a88e 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 b699d762d29c..b699d762d29c 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 7f2427777f92..7f2427777f92 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 1358b167f6ec..1358b167f6ec 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 fc40fe7408b6..fc40fe7408b6 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 bb7890100087..bb7890100087 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 cf2d38cd9978..cf2d38cd9978 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 28060de74118..28060de74118 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 6b3ff6fd62b0..6b3ff6fd62b0 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 c563b34ff3bc..c563b34ff3bc 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/default.nix b/nixpkgs/pkgs/build-support/docker/default.nix
index 72d0a61887e6..72d0a61887e6 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 439c21313878..439c21313878 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 29eea33a7e18..29eea33a7e18 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 839dc87487a0..839dc87487a0 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 c1d86adc6d81..c1d86adc6d81 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 bcad9e83e06f..bcad9e83e06f 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 f91a90bdbdab..f91a90bdbdab 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 379141704523..379141704523 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 0edfd0b467ab..0edfd0b467ab 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 3f81cc73e801..3f81cc73e801 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 8a7f36522a3d..8a7f36522a3d 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 0dbf1eecbad8..0dbf1eecbad8 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 d8d29912c8fa..d8d29912c8fa 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 f2e7d4cf8b2c..f2e7d4cf8b2c 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 633d23c05ff2..633d23c05ff2 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 abad090ebcbf..abad090ebcbf 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 a991bcb6933a..a991bcb6933a 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 62370d361cd0..62370d361cd0 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 781a5ba8c0ee..781a5ba8c0ee 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 4b07fc27dcb0..4b07fc27dcb0 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 8f824f4e1a57..8f824f4e1a57 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 e6f6c23e449f..e6f6c23e449f 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 64587c0fad1a..64587c0fad1a 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 6fa27f098392..6fa27f098392 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 e2ec84c75e66..e2ec84c75e66 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 99c755e2afcb..99c755e2afcb 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 e1db3e828fd7..e1db3e828fd7 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 396c971b2f01..396c971b2f01 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 dfdd5b60851d..dfdd5b60851d 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 2a4bee74197b..2a4bee74197b 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 05b9c62b1e8d..05b9c62b1e8d 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 a99f72e9eaa7..a99f72e9eaa7 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 fd971d431df8..fd971d431df8 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 e424fd92d51e..e424fd92d51e 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 f9250de4ee07..f9250de4ee07 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 dbe8a7ef8013..dbe8a7ef8013 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 0975c3478820..0975c3478820 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 1f7947d4d452..1f7947d4d452 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 f9ed8ffa066f..f9ed8ffa066f 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 301deb98307f..301deb98307f 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 02777c9900dc..02777c9900dc 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 6d084d3c77ed..6d084d3c77ed 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 bbd2bae46df5..bbd2bae46df5 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 9fd813bfa575..9fd813bfa575 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 869ba637429c..869ba637429c 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 7443591e6569..7443591e6569 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 3b0c33770467..3b0c33770467 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 5f08aca424fe..5f08aca424fe 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 27933b47178a..27933b47178a 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 6ae46469738a..6ae46469738a 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 256c86748d28..256c86748d28 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 b447911ab8d3..b447911ab8d3 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/nixpkgs/pkgs/build-support/fetchgit/nix-prefetch-git
diff --git a/pkgs/build-support/fetchgit/private.nix b/nixpkgs/pkgs/build-support/fetchgit/private.nix
index 59376f3b0424..59376f3b0424 100644
--- a/pkgs/build-support/fetchgit/private.nix
+++ b/nixpkgs/pkgs/build-support/fetchgit/private.nix
diff --git a/pkgs/build-support/fetchgithub/default.nix b/nixpkgs/pkgs/build-support/fetchgithub/default.nix
index 66671dd0a6ae..66671dd0a6ae 100644
--- a/pkgs/build-support/fetchgithub/default.nix
+++ b/nixpkgs/pkgs/build-support/fetchgithub/default.nix
diff --git a/pkgs/build-support/fetchgitlab/default.nix b/nixpkgs/pkgs/build-support/fetchgitlab/default.nix
index be110cf8393e..be110cf8393e 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 fa1945775537..fa1945775537 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 3ccf5d273fc5..3ccf5d273fc5 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 847f18fa5975..847f18fa5975 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 41eff1f9c0c5..41eff1f9c0c5 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 94c6b1ec6945..94c6b1ec6945 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 7a6a517566f5..7a6a517566f5 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 7a66999ec569..7a66999ec569 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 dc48a312fb37..dc48a312fb37 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 c1b0db895bc1..c1b0db895bc1 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 7ce67453d698..7ce67453d698 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 960bc3c1ffb2..960bc3c1ffb2 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 2fb32b2324f2..2fb32b2324f2 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 3ac7cace0dcf..3ac7cace0dcf 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 f8793dbac950..f8793dbac950 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 3dbde203374d..3dbde203374d 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 994922a58679..994922a58679 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 c386a3f3489f..c386a3f3489f 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 68433d1471d6..68433d1471d6 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 03b9eb9a03df..03b9eb9a03df 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 288451a225c7..288451a225c7 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 d9c6dc7da31a..d9c6dc7da31a 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 fbd74efd750a..fbd74efd750a 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 c00f39714e5b..c00f39714e5b 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 bd71f93c5291..bd71f93c5291 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 74fdc320835f..74fdc320835f 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 6300587a7d15..6300587a7d15 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 f2336db8852b..f2336db8852b 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 2dabd2e722be..2dabd2e722be 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 c61df8ceb001..c61df8ceb001 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 994adbd91dae..994adbd91dae 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 192f3bb54c29..192f3bb54c29 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 0ea18d8768ac..0ea18d8768ac 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/kernel/make-initrd.nix b/nixpkgs/pkgs/build-support/kernel/make-initrd.nix
index 7a5642e565de..7a5642e565de 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 0aeaedeb3724..0aeaedeb3724 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 d82e279799ba..d82e279799ba 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 5658094872c8..5658094872c8 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 1465b73fddb6..1465b73fddb6 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 6e54e2a696c5..6e54e2a696c5 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 8e8da00b02a2..8e8da00b02a2 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 b57664db3c19..b57664db3c19 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 f8c31ed5c1d4..f8c31ed5c1d4 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 da1d4105c89f..da1d4105c89f 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 70f1d2ca1b25..70f1d2ca1b25 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 30584aceb9f8..30584aceb9f8 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 a70dc0390cb5..a70dc0390cb5 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 67abc465a9bd..67abc465a9bd 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 8f7d1e795d79..8f7d1e795d79 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 4a8b468692f0..4a8b468692f0 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 28ee6bad5540..28ee6bad5540 100644
--- a/pkgs/build-support/nix-gitignore/default.nix
+++ b/nixpkgs/pkgs/build-support/nix-gitignore/default.nix
diff --git a/pkgs/build-support/nix-prefetch-github/default.nix b/nixpkgs/pkgs/build-support/nix-prefetch-github/default.nix
index 3c5cbe2b4928..3c5cbe2b4928 100644
--- a/pkgs/build-support/nix-prefetch-github/default.nix
+++ b/nixpkgs/pkgs/build-support/nix-prefetch-github/default.nix
diff --git a/pkgs/build-support/nuke-references/builder.sh b/nixpkgs/pkgs/build-support/nuke-references/builder.sh
index 7da322032185..7da322032185 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 8f976ad462cc..8f976ad462cc 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 cc2001c66e2e..cc2001c66e2e 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 a0aac1447969..a0aac1447969 100644
--- a/pkgs/build-support/ocaml/dune.nix
+++ b/nixpkgs/pkgs/build-support/ocaml/dune.nix
diff --git a/pkgs/build-support/plugins.nix b/nixpkgs/pkgs/build-support/plugins.nix
index bf8a982a88f9..bf8a982a88f9 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 2e55e3707421..2e55e3707421 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 579f3b041fa8..579f3b041fa8 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 4cae2dcf3ca9..4cae2dcf3ca9 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 2d24d5bd7041..2d24d5bd7041 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 dad65a0e7eb3..dad65a0e7eb3 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 354d929c9b65..354d929c9b65 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 5e3eb751b81e..5e3eb751b81e 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 120d19685427..120d19685427 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 8ce5c0488a7d..8ce5c0488a7d 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 f7ea07baccbe..f7ea07baccbe 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 feda54de46fe..feda54de46fe 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 194bbc60534e..194bbc60534e 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 c7129ae83f92..c7129ae83f92 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 8b1d05fc2307..8b1d05fc2307 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 15ab50bf3974..15ab50bf3974 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 2999c3d4c1d9..2999c3d4c1d9 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 169adcf2d43a..169adcf2d43a 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 acb2ee63cce4..acb2ee63cce4 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 14d997b2d5cf..14d997b2d5cf 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 3b0282621ea1..3b0282621ea1 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/test/brotli-crates.nix b/nixpkgs/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix
index 068cc5a98843..068cc5a98843 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 f3f9ef377c8c..f3f9ef377c8c 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 2d7a18957184..2d7a18957184 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/cargo-vendor/cargo-vendor.nix b/nixpkgs/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix
index 9af5cbe652c3..9af5cbe652c3 100644
--- a/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix
+++ b/nixpkgs/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix
diff --git a/pkgs/build-support/rust/cargo-vendor/default.nix b/nixpkgs/pkgs/build-support/rust/cargo-vendor/default.nix
index f252c6a6cb1f..f252c6a6cb1f 100644
--- a/pkgs/build-support/rust/cargo-vendor/default.nix
+++ b/nixpkgs/pkgs/build-support/rust/cargo-vendor/default.nix
diff --git a/pkgs/build-support/rust/carnix.nix b/nixpkgs/pkgs/build-support/rust/carnix.nix
index 46bbff92a9cc..46bbff92a9cc 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 9dd2da28ad5b..9dd2da28ad5b 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 c0b1797f73f5..c0b1797f73f5 100644
--- a/pkgs/build-support/rust/default-crate-overrides.nix
+++ b/nixpkgs/pkgs/build-support/rust/default-crate-overrides.nix
diff --git a/nixpkgs/pkgs/build-support/rust/default.nix b/nixpkgs/pkgs/build-support/rust/default.nix
new file mode 100644
index 000000000000..5ff430475caa
--- /dev/null
+++ b/nixpkgs/pkgs/build-support/rust/default.nix
@@ -0,0 +1,155 @@
+{ stdenv, cacert, git, cargo, rustc, fetchcargo, buildPackages }:
+
+let
+  buildRustPackage =
+    { name ? "${args.pname}-${args.version}"
+    , cargoSha256 ? "unset"
+    , src ? null
+    , srcs ? null
+    , cargoPatches ? []
+    , patches ? []
+    , sourceRoot ? null
+    , logLevel ? ""
+    , buildInputs ? []
+    , nativeBuildInputs ? []
+    , cargoUpdateHook ? ""
+    , cargoDepsHook ? ""
+    , cargoBuildFlags ? []
+    , buildType ? "release"
+
+    , cargoVendorDir ? null
+    , ... } @ args:
+
+    assert cargoVendorDir == null -> cargoSha256 != "unset";
+    assert buildType == "release" || buildType == "debug";
+
+    let
+      cargoDeps = if cargoVendorDir == null
+        then fetchcargo {
+            inherit name src srcs sourceRoot cargoUpdateHook;
+            patches = cargoPatches;
+            sha256 = cargoSha256;
+          }
+        else null;
+
+      setupVendorDir = if cargoVendorDir == null
+        then ''
+          unpackFile "$cargoDeps"
+          cargoDepsCopy=$(stripHash $(basename $cargoDeps))
+          chmod -R +w "$cargoDepsCopy"
+        ''
+        else ''
+          cargoDepsCopy="$sourceRoot/${cargoVendorDir}"
+        '';
+
+      ccForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc";
+      cxxForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++";
+      ccForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc";
+      cxxForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++";
+      releaseDir = "target/${stdenv.hostPlatform.config}/${buildType}";
+
+    in stdenv.mkDerivation (args // {
+      inherit cargoDeps;
+
+      patchRegistryDeps = ./patch-registry-deps;
+
+      nativeBuildInputs = [ cargo rustc git cacert ] ++ nativeBuildInputs;
+      inherit buildInputs;
+
+      patches = cargoPatches ++ patches;
+
+      PKG_CONFIG_ALLOW_CROSS =
+        if stdenv.buildPlatform != stdenv.hostPlatform then 1 else 0;
+
+      postUnpack = ''
+        eval "$cargoDepsHook"
+
+        ${setupVendorDir}
+
+        mkdir .cargo
+        config="$(pwd)/$cargoDepsCopy/.cargo/config";
+        if [[ ! -e $config ]]; then
+          config=${./fetchcargo-default-config.toml};
+        fi;
+        substitute $config .cargo/config \
+          --subst-var-by vendor "$(pwd)/$cargoDepsCopy"
+
+        unset cargoDepsCopy
+
+        export RUST_LOG=${logLevel}
+      '' + (args.postUnpack or "");
+
+      configurePhase = args.configurePhase or ''
+        runHook preConfigure
+        mkdir -p .cargo
+        cat >> .cargo/config <<'EOF'
+        [target."${stdenv.buildPlatform.config}"]
+        "linker" = "${ccForBuild}"
+        ${stdenv.lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) ''
+        [target."${stdenv.hostPlatform.config}"]
+        "linker" = "${ccForHost}"
+        ''}
+        EOF
+        cat .cargo/config
+        runHook postConfigure
+      '';
+
+      buildPhase = with builtins; args.buildPhase or ''
+        runHook preBuild
+
+        (
+        set -x
+        env \
+          "CC_${stdenv.buildPlatform.config}"="${ccForBuild}" \
+          "CXX_${stdenv.buildPlatform.config}"="${cxxForBuild}" \
+          "CC_${stdenv.hostPlatform.config}"="${ccForHost}" \
+          "CXX_${stdenv.hostPlatform.config}"="${cxxForHost}" \
+          cargo build \
+            --${buildType} \
+            --target ${stdenv.hostPlatform.config} \
+            --frozen ${concatStringsSep " " cargoBuildFlags}
+        )
+
+        # rename the output dir to a architecture independent one
+        mapfile -t targets < <(find "$NIX_BUILD_TOP" -type d | grep '${releaseDir}$')
+        for target in "''${targets[@]}"; do
+          rm -rf "$target/../../${buildType}"
+          ln -srf "$target" "$target/../../"
+        done
+
+        runHook postBuild
+      '';
+
+      checkPhase = args.checkPhase or ''
+        runHook preCheck
+        echo "Running cargo test"
+        cargo test
+        runHook postCheck
+      '';
+
+      doCheck = args.doCheck or true;
+
+      inherit releaseDir;
+
+      installPhase = args.installPhase or ''
+        runHook preInstall
+        mkdir -p $out/bin $out/lib
+
+        find $releaseDir \
+          -maxdepth 1 \
+          -type f \
+          -executable ! \( -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \) \
+          -print0 | xargs -r -0 cp -t $out/bin
+        find $releaseDir \
+          -maxdepth 1 \
+          -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \
+          -print0 | xargs -r -0 cp -t $out/lib
+        rmdir --ignore-fail-on-non-empty $out/lib $out/bin
+        runHook postInstall
+      '';
+
+      passthru = { inherit cargoDeps; } // (args.passthru or {});
+    }) // {
+      overrideRustAttrs = f: buildRustPackage (args // (f args));
+    };
+in buildRustPackage
diff --git a/pkgs/build-support/rust/fetchcargo-default-config.toml b/nixpkgs/pkgs/build-support/rust/fetchcargo-default-config.toml
index dd8ebbc32d31..dd8ebbc32d31 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 4e6058383d48..4e6058383d48 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 95dfd38b12ae..95dfd38b12ae 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 fbb094304587..fbb094304587 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 5264ce398511..5264ce398511 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 6af8eb1aed99..6af8eb1aed99 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 c08cab158688..c08cab158688 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 6bef786ac3ac..6bef786ac3ac 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 d10a898d6e46..d10a898d6e46 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 0db41e030f4c..0db41e030f4c 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 7175b408b02f..7175b408b02f 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 85364a61f612..85364a61f612 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 af2ff0cc9662..af2ff0cc9662 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 559b543fadfc..559b543fadfc 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/keep-build-tree.sh b/nixpkgs/pkgs/build-support/setup-hooks/keep-build-tree.sh
index 754900bfc337..754900bfc337 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 b53e184b0956..b53e184b0956 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 9108b4c50355..9108b4c50355 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-wrapper.sh b/nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh
index 06891893e8c1..06891893e8c1 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 ef31dcdce274..ef31dcdce274 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 7724be369c9c..7724be369c9c 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 cc51c27cafdf..cc51c27cafdf 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 d43b18776742..d43b18776742 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 3e900d0704cf..3e900d0704cf 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 5d7432e8f09a..5d7432e8f09a 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 6f1c36f5c050..6f1c36f5c050 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 19dbb10d18e7..19dbb10d18e7 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 5d3548dc2e88..5d3548dc2e88 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 ae34ffec4854..ae34ffec4854 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 96bf48cf123a..96bf48cf123a 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/strip.sh b/nixpkgs/pkgs/build-support/setup-hooks/strip.sh
index fc4c7bfbaf95..fc4c7bfbaf95 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 66f4e91c7bb6..66f4e91c7bb6 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 53335d7a9a7a..53335d7a9a7a 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 6130f32bef86..6130f32bef86 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 906b1db9d10e..906b1db9d10e 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 4fa2f42c39dc..4fa2f42c39dc 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 c110d327d3af..c110d327d3af 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 ce32279710e2..ce32279710e2 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 16bae04b21e2..16bae04b21e2 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 ba5271868911..ba5271868911 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 cef7500bcbaf..cef7500bcbaf 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 938df1efd18a..938df1efd18a 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 a93b36480908..a93b36480908 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 66feb695c418..66feb695c418 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 57b160bbe901..57b160bbe901 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 ec220481fcc0..ec220481fcc0 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 aca4e340e267..aca4e340e267 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 f39595f89776..f39595f89776 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 5706a98f6008..5706a98f6008 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 bdf44b7a5bf3..bdf44b7a5bf3 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 6687a1f8f411..6687a1f8f411 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 fbbbe33a9e7b..fbbbe33a9e7b 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 128be89d2075..128be89d2075 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 2c06696c928f..2c06696c928f 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 498f15c28a78..498f15c28a78 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 38c0d13a723d..38c0d13a723d 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 fe439c5d11e3..fe439c5d11e3 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 e60499b60f27..e60499b60f27 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 ae47e5590294..ae47e5590294 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 db39286ccb02..db39286ccb02 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 bed397d6f07e..bed397d6f07e 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 5d04302591ee..5d04302591ee 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 6442cd91a957..6442cd91a957 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 d0d85fce3662..d0d85fce3662 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 3b06d8f47490..3b06d8f47490 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 08b93aaf1174..08b93aaf1174 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 76cd41a75bc7..76cd41a75bc7 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 4c0d67c43bac..4c0d67c43bac 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 e5ff13f0da9d..e5ff13f0da9d 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 fe8e8f61de02..fe8e8f61de02 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 5b1ff84cf44d..5b1ff84cf44d 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 4fd57162072e..4fd57162072e 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 ae7b42449fb3..ae7b42449fb3 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 80e9543f9c85..80e9543f9c85 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 1bec4a73996f..1bec4a73996f 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 591ffa6ca5ba..591ffa6ca5ba 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 51ebe704beac..51ebe704beac 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 4bdfa70c63ff..4bdfa70c63ff 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 b45edf7947ba..b45edf7947ba 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 04130f25f30a..04130f25f30a 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 08690b7cecfc..08690b7cecfc 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 6ec5c855abab..6ec5c855abab 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 bd38389eb47e..bd38389eb47e 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 d252a1680bd7..d252a1680bd7 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 1aa6a49f02d2..1aa6a49f02d2 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 a0fff6507e4b..a0fff6507e4b 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 d90fa99dd702..d90fa99dd702 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 25df45258a6f..25df45258a6f 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 63fe26f069c7..63fe26f069c7 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 be0cab305eb5..be0cab305eb5 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 e9f4fbd48678..e9f4fbd48678 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 ee85ee598827..ee85ee598827 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 36d8ed3c6747..36d8ed3c6747 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 0f20b9c46cf5..0f20b9c46cf5 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 e03a800b3ad5..e03a800b3ad5 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 53f4d94b38fe..53f4d94b38fe 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 52e2d4a42330..52e2d4a42330 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 4aeda64377ed..4aeda64377ed 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 827d7b0a5a44..827d7b0a5a44 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 1e52ea301afa..1e52ea301afa 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 a87be94acd09..a87be94acd09 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 1c2d7f53bad8..1c2d7f53bad8 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 5408e7b1b1d1..5408e7b1b1d1 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 583a7457e2dc..583a7457e2dc 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 70074a58d964..70074a58d964 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 8b4228ec4235..8b4228ec4235 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 0a8168cdf9e2..0a8168cdf9e2 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 f763e2a8c346..f763e2a8c346 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 29bd001f8089..29bd001f8089 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 98175373ebd5..98175373ebd5 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 4403d690a16d..4403d690a16d 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 294af3b6c784..294af3b6c784 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 3c0e314579de..3c0e314579de 100644
--- a/pkgs/data/fonts/carlito/default.nix
+++ b/nixpkgs/pkgs/data/fonts/carlito/default.nix
diff --git a/pkgs/data/fonts/charis-sil/default.nix b/nixpkgs/pkgs/data/fonts/charis-sil/default.nix
index e28a718fad14..e28a718fad14 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 6d1c4b10c91a..6d1c4b10c91a 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 0df3ba4f659c..0df3ba4f659c 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 c058f07ed51c..c058f07ed51c 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 965bf119f6e7..965bf119f6e7 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 6e4c0bb08e7a..6e4c0bb08e7a 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 2615d0260f0d..2615d0260f0d 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 be5f6cca866d..be5f6cca866d 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 d51c915b844e..d51c915b844e 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 e1635c560d66..e1635c560d66 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 5e06a34b6f0b..5e06a34b6f0b 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 503e62cfa295..503e62cfa295 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 bad78e3433e1..bad78e3433e1 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 a3f24985fd9d..a3f24985fd9d 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 5aad7ff236f1..5aad7ff236f1 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 b73da9a504b3..b73da9a504b3 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 e563d201ff3d..e563d201ff3d 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 27306a0ef05c..27306a0ef05c 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 8638ec74f77a..8638ec74f77a 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 4837425d19a7..4837425d19a7 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 48b170e2e1b6..48b170e2e1b6 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 59371593f79b..59371593f79b 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 142332689916..142332689916 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 e7981f63baf3..e7981f63baf3 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 3e71352f8025..3e71352f8025 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 787a83f95611..787a83f95611 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 0e31231d05fc..0e31231d05fc 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 58586ba7db65..58586ba7db65 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 55250156fcd0..55250156fcd0 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 28969f02364a..28969f02364a 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 5b982dcaa3e6..5b982dcaa3e6 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 ec3f3218ea56..ec3f3218ea56 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 b0b58b0ebfcc..b0b58b0ebfcc 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 624616bdd580..624616bdd580 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 2f50a83a70b4..2f50a83a70b4 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 fe27ac2cd5db..fe27ac2cd5db 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 14232edee0cb..14232edee0cb 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 ee1365d26118..ee1365d26118 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 601146d99a9d..601146d99a9d 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 c5e19edea262..c5e19edea262 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 4d925b269cd3..4d925b269cd3 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 71c92a72e593..71c92a72e593 100644
--- a/pkgs/data/fonts/gdouros/default.nix
+++ b/nixpkgs/pkgs/data/fonts/gdouros/default.nix
diff --git a/pkgs/data/fonts/gentium-book-basic/default.nix b/nixpkgs/pkgs/data/fonts/gentium-book-basic/default.nix
index 505b273c2d24..505b273c2d24 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 a60a39f4f01e..a60a39f4f01e 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 bb28d3be67fa..bb28d3be67fa 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 59ac4ec850b1..59ac4ec850b1 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 207f3615d1b4..207f3615d1b4 100644
--- a/pkgs/data/fonts/google-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/google-fonts/default.nix
diff --git a/pkgs/data/fonts/gyre/default.nix b/nixpkgs/pkgs/data/fonts/gyre/default.nix
index 91a8aaf3c301..91a8aaf3c301 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 ef0df1ba67f6..ef0df1ba67f6 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 29c982ed8aea..29c982ed8aea 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 6286cf8a1df8..6286cf8a1df8 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 759d2c2db1d2..759d2c2db1d2 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 f641b36a1b05..f641b36a1b05 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 362781c05bb5..362781c05bb5 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 a042a31f1d02..a042a31f1d02 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 7e1014da2102..7e1014da2102 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 7eded5deab48..7eded5deab48 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 8b5570081757..8b5570081757 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 4910ef21f9ab..4910ef21f9ab 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 52c28db639ef..52c28db639ef 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 d9ef6684faa6..d9ef6684faa6 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 589acbcee5cc..589acbcee5cc 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 0676d3c0e1f6..0676d3c0e1f6 100644
--- a/pkgs/data/fonts/iosevka/bin.nix
+++ b/nixpkgs/pkgs/data/fonts/iosevka/bin.nix
diff --git a/nixpkgs/pkgs/data/fonts/iosevka/default.nix b/nixpkgs/pkgs/data/fonts/iosevka/default.nix
new file mode 100644
index 000000000000..d281dd37f455
--- /dev/null
+++ b/nixpkgs/pkgs/data/fonts/iosevka/default.nix
@@ -0,0 +1,63 @@
+{ stdenv, lib, pkgs, fetchFromGitHub, fetchurl
+, nodejs, remarshal, ttfautohint-nox, otfcc
+
+# Custom font set options.
+# See https://github.com/be5invis/Iosevka#build-your-own-style
+, buildPlan ? { family = "Iosevka"; }
+, set ? "iosevka"
+}:
+
+let
+  nodePackages = import ./node.nix {
+    inherit pkgs nodejs;
+    inherit (stdenv.hostPlatform) system;
+  };
+
+  nodePackage = with lib; elemAt (attrValues nodePackages) 0;
+
+in stdenv.mkDerivation rec {
+  pname = set;
+  inherit (nodePackage) version;
+
+  src = nodePackage;
+  sourceRoot = "${nodePackage.name}/lib/node_modules/iosevka";
+
+  nativeBuildInputs = [ nodejs remarshal otfcc ttfautohint-nox ];
+
+  buildPlans = builtins.toJSON { buildPlans.${set} = buildPlan; };
+  passAsFile = [ "buildPlans" ];
+
+  configurePhase = ''
+    runHook preConfigure
+    remarshal -i "$buildPlansPath" -o private-build-plans.toml -if json -of toml
+    runHook postConfigure
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+    npm --no-update-notifier run build -- "ttf:$pname"
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    fontdir="$out/share/fonts/$pname"
+    install -d "$fontdir"
+    install "dist/$pname/ttf"/* "$fontdir"
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    homepage = https://be5invis.github.io/Iosevka/;
+    downloadPage = "https://github.com/be5invis/Iosevka/releases";
+    description = ''
+      Slender monospace sans-serif and slab-serif typeface inspired by Pragmata
+      Pro, M+ and PF DIN Mono, designed to be the ideal font for programming.
+    '';
+    license = licenses.ofl;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ cstrahan jfrankenau ttuegel ];
+  };
+}
diff --git a/nixpkgs/pkgs/data/fonts/iosevka/generate.sh b/nixpkgs/pkgs/data/fonts/iosevka/generate.sh
new file mode 100755
index 000000000000..db7ffd517c59
--- /dev/null
+++ b/nixpkgs/pkgs/data/fonts/iosevka/generate.sh
@@ -0,0 +1,8 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash -p nodePackages.node2nix -I nixpkgs=../../../..
+
+node2nix -8 \
+         -i node-packages.json \
+         -e ../../../development/node-packages/node-env.nix \
+         --no-copy-node-env \
+         -c node.nix
diff --git a/nixpkgs/pkgs/data/fonts/iosevka/node-packages.json b/nixpkgs/pkgs/data/fonts/iosevka/node-packages.json
new file mode 100644
index 000000000000..51d09d78ca1e
--- /dev/null
+++ b/nixpkgs/pkgs/data/fonts/iosevka/node-packages.json
@@ -0,0 +1,3 @@
+[
+  { "iosevka": "https://github.com/be5invis/Iosevka/archive/v2.1.0.tar.gz" }
+]
diff --git a/nixpkgs/pkgs/data/fonts/iosevka/node-packages.nix b/nixpkgs/pkgs/data/fonts/iosevka/node-packages.nix
new file mode 100644
index 000000000000..b57a79bd8249
--- /dev/null
+++ b/nixpkgs/pkgs/data/fonts/iosevka/node-packages.nix
@@ -0,0 +1,3289 @@
+# This file has been generated by node2nix 1.7.0. Do not edit!
+
+{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
+
+let
+  sources = {
+    "JSONStream-1.3.5" = {
+      name = "JSONStream";
+      packageName = "JSONStream";
+      version = "1.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz";
+        sha512 = "E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==";
+      };
+    };
+    "abbrev-1.1.1" = {
+      name = "abbrev";
+      packageName = "abbrev";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz";
+        sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
+      };
+    };
+    "ajv-6.10.0" = {
+      name = "ajv";
+      packageName = "ajv";
+      version = "6.10.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz";
+        sha512 = "nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==";
+      };
+    };
+    "amdefine-1.0.1" = {
+      name = "amdefine";
+      packageName = "amdefine";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz";
+        sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5";
+      };
+    };
+    "ansi-regex-2.1.1" = {
+      name = "ansi-regex";
+      packageName = "ansi-regex";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz";
+        sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
+      };
+    };
+    "ansi-regex-3.0.0" = {
+      name = "ansi-regex";
+      packageName = "ansi-regex";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz";
+        sha1 = "ed0317c322064f79466c02966bddb605ab37d998";
+      };
+    };
+    "ansi-styles-3.2.1" = {
+      name = "ansi-styles";
+      packageName = "ansi-styles";
+      version = "3.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz";
+        sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==";
+      };
+    };
+    "aproba-1.2.0" = {
+      name = "aproba";
+      packageName = "aproba";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz";
+        sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==";
+      };
+    };
+    "are-we-there-yet-1.1.5" = {
+      name = "are-we-there-yet";
+      packageName = "are-we-there-yet";
+      version = "1.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz";
+        sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==";
+      };
+    };
+    "argparse-1.0.10" = {
+      name = "argparse";
+      packageName = "argparse";
+      version = "1.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz";
+        sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==";
+      };
+    };
+    "asn1-0.2.4" = {
+      name = "asn1";
+      packageName = "asn1";
+      version = "0.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz";
+        sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==";
+      };
+    };
+    "assert-plus-1.0.0" = {
+      name = "assert-plus";
+      packageName = "assert-plus";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz";
+        sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
+      };
+    };
+    "asynckit-0.4.0" = {
+      name = "asynckit";
+      packageName = "asynckit";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz";
+        sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
+      };
+    };
+    "aws-sign2-0.7.0" = {
+      name = "aws-sign2";
+      packageName = "aws-sign2";
+      version = "0.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz";
+        sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
+      };
+    };
+    "aws4-1.8.0" = {
+      name = "aws4";
+      packageName = "aws4";
+      version = "1.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz";
+        sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==";
+      };
+    };
+    "balanced-match-1.0.0" = {
+      name = "balanced-match";
+      packageName = "balanced-match";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";
+        sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
+      };
+    };
+    "bcrypt-pbkdf-1.0.2" = {
+      name = "bcrypt-pbkdf";
+      packageName = "bcrypt-pbkdf";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz";
+        sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e";
+      };
+    };
+    "bezier-js-2.4.0" = {
+      name = "bezier-js";
+      packageName = "bezier-js";
+      version = "2.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bezier-js/-/bezier-js-2.4.0.tgz";
+        sha512 = "ttwqGL47RtYOoZy10oFJZ1VlEC6w1eJW1xMPBAvEx57cTWgmaJNr/c2ZLMr/O2RD50saR0OaLBIpgyZ7rkHLSw==";
+      };
+    };
+    "bindings-1.5.0" = {
+      name = "bindings";
+      packageName = "bindings";
+      version = "1.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz";
+        sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==";
+      };
+    };
+    "block-stream-0.0.9" = {
+      name = "block-stream";
+      packageName = "block-stream";
+      version = "0.0.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz";
+        sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a";
+      };
+    };
+    "bluebird-3.5.5" = {
+      name = "bluebird";
+      packageName = "bluebird";
+      version = "3.5.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz";
+        sha512 = "5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==";
+      };
+    };
+    "brace-expansion-1.1.11" = {
+      name = "brace-expansion";
+      packageName = "brace-expansion";
+      version = "1.1.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
+        sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
+      };
+    };
+    "bufferstreams-1.1.3" = {
+      name = "bufferstreams";
+      packageName = "bufferstreams";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.1.3.tgz";
+        sha512 = "HaJnVuslRF4g2kSDeyl++AaVizoitCpL9PglzCYwy0uHHyvWerfvEb8jWmYbF1z4kiVFolGomnxSGl+GUQp2jg==";
+      };
+    };
+    "camel-case-3.0.0" = {
+      name = "camel-case";
+      packageName = "camel-case";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz";
+        sha1 = "ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73";
+      };
+    };
+    "camelcase-3.0.0" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz";
+        sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a";
+      };
+    };
+    "camelcase-4.1.0" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz";
+        sha1 = "d545635be1e33c542649c69173e5de6acfae34dd";
+      };
+    };
+    "camelcase-5.3.1" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "5.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz";
+        sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==";
+      };
+    };
+    "caryll-shapeops-0.3.1" = {
+      name = "caryll-shapeops";
+      packageName = "caryll-shapeops";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/caryll-shapeops/-/caryll-shapeops-0.3.1.tgz";
+        sha512 = "3TdH6DZGL08S6qEvCZLNaOHyFvmzQts8m+TyYEvc6/PiI+XgX5mIag1/CKczIM8e2QtDr8JKW8foo4VNOM8/Og==";
+      };
+    };
+    "caseless-0.12.0" = {
+      name = "caseless";
+      packageName = "caseless";
+      version = "0.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz";
+        sha1 = "1b681c21ff84033c826543090689420d187151dc";
+      };
+    };
+    "chalk-2.4.2" = {
+      name = "chalk";
+      packageName = "chalk";
+      version = "2.4.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz";
+        sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==";
+      };
+    };
+    "change-case-3.1.0" = {
+      name = "change-case";
+      packageName = "change-case";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/change-case/-/change-case-3.1.0.tgz";
+        sha512 = "2AZp7uJZbYEzRPsFoa+ijKdvp9zsrnnt6+yFokfwEpeJm0xuJDVoxiRCAaTzyJND8GJkofo2IcKWaUZ/OECVzw==";
+      };
+    };
+    "child-process-promise-2.2.1" = {
+      name = "child-process-promise";
+      packageName = "child-process-promise";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/child-process-promise/-/child-process-promise-2.2.1.tgz";
+        sha1 = "4730a11ef610fad450b8f223c79d31d7bdad8074";
+      };
+    };
+    "cli-cursor-2.1.0" = {
+      name = "cli-cursor";
+      packageName = "cli-cursor";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz";
+        sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5";
+      };
+    };
+    "cli-spinners-1.3.1" = {
+      name = "cli-spinners";
+      packageName = "cli-spinners";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.1.tgz";
+        sha512 = "1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg==";
+      };
+    };
+    "clipper-lib-1.0.0" = {
+      name = "clipper-lib";
+      packageName = "clipper-lib";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clipper-lib/-/clipper-lib-1.0.0.tgz";
+        sha1 = "e902ceb26e28ee5cfa6014abdf790a51efff4ecb";
+      };
+    };
+    "cliui-3.2.0" = {
+      name = "cliui";
+      packageName = "cliui";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz";
+        sha1 = "120601537a916d29940f934da3b48d585a39213d";
+      };
+    };
+    "cliui-4.1.0" = {
+      name = "cliui";
+      packageName = "cliui";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz";
+        sha512 = "4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==";
+      };
+    };
+    "clone-1.0.4" = {
+      name = "clone";
+      packageName = "clone";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz";
+        sha1 = "da309cc263df15994c688ca902179ca3c7cd7c7e";
+      };
+    };
+    "clone-2.1.2" = {
+      name = "clone";
+      packageName = "clone";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz";
+        sha1 = "1b7f4b9f591f1e8f83670401600345a02887435f";
+      };
+    };
+    "code-point-at-1.1.0" = {
+      name = "code-point-at";
+      packageName = "code-point-at";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz";
+        sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77";
+      };
+    };
+    "coffee-script-1.12.7" = {
+      name = "coffee-script";
+      packageName = "coffee-script";
+      version = "1.12.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz";
+        sha512 = "fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==";
+      };
+    };
+    "color-convert-1.9.3" = {
+      name = "color-convert";
+      packageName = "color-convert";
+      version = "1.9.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz";
+        sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==";
+      };
+    };
+    "color-name-1.1.3" = {
+      name = "color-name";
+      packageName = "color-name";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz";
+        sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25";
+      };
+    };
+    "combined-stream-1.0.8" = {
+      name = "combined-stream";
+      packageName = "combined-stream";
+      version = "1.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz";
+        sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==";
+      };
+    };
+    "complex.js-2.0.11" = {
+      name = "complex.js";
+      packageName = "complex.js";
+      version = "2.0.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/complex.js/-/complex.js-2.0.11.tgz";
+        sha512 = "6IArJLApNtdg1P1dFtn3dnyzoZBEF0MwMnrfF1exSBRpZYoy4yieMkpZhQDC0uwctw48vii0CFVyHfpgZ/DfGw==";
+      };
+    };
+    "concat-map-0.0.1" = {
+      name = "concat-map";
+      packageName = "concat-map";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
+        sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
+      };
+    };
+    "console-control-strings-1.1.0" = {
+      name = "console-control-strings";
+      packageName = "console-control-strings";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz";
+        sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e";
+      };
+    };
+    "constant-case-2.0.0" = {
+      name = "constant-case";
+      packageName = "constant-case";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/constant-case/-/constant-case-2.0.0.tgz";
+        sha1 = "4175764d389d3fa9c8ecd29186ed6005243b6a46";
+      };
+    };
+    "core-util-is-1.0.2" = {
+      name = "core-util-is";
+      packageName = "core-util-is";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
+        sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
+      };
+    };
+    "cross-spawn-4.0.2" = {
+      name = "cross-spawn";
+      packageName = "cross-spawn";
+      version = "4.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz";
+        sha1 = "7b9247621c23adfdd3856004a823cbe397424d41";
+      };
+    };
+    "cross-spawn-5.1.0" = {
+      name = "cross-spawn";
+      packageName = "cross-spawn";
+      version = "5.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz";
+        sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449";
+      };
+    };
+    "cross-spawn-6.0.5" = {
+      name = "cross-spawn";
+      packageName = "cross-spawn";
+      version = "6.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz";
+        sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==";
+      };
+    };
+    "cubic2quad-1.1.1" = {
+      name = "cubic2quad";
+      packageName = "cubic2quad";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cubic2quad/-/cubic2quad-1.1.1.tgz";
+        sha1 = "69b19c61a3f5b41ecf2f1d5fae8fb03415aa8b15";
+      };
+    };
+    "dashdash-1.14.1" = {
+      name = "dashdash";
+      packageName = "dashdash";
+      version = "1.14.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz";
+        sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
+      };
+    };
+    "decamelize-1.2.0" = {
+      name = "decamelize";
+      packageName = "decamelize";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz";
+        sha1 = "f6534d15148269b20352e7bee26f501f9a191290";
+      };
+    };
+    "decimal.js-10.2.0" = {
+      name = "decimal.js";
+      packageName = "decimal.js";
+      version = "10.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.0.tgz";
+        sha512 = "vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw==";
+      };
+    };
+    "deep-is-0.1.3" = {
+      name = "deep-is";
+      packageName = "deep-is";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz";
+        sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34";
+      };
+    };
+    "defaults-1.0.3" = {
+      name = "defaults";
+      packageName = "defaults";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz";
+        sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d";
+      };
+    };
+    "delayed-stream-1.0.0" = {
+      name = "delayed-stream";
+      packageName = "delayed-stream";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
+        sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
+      };
+    };
+    "delegates-1.0.0" = {
+      name = "delegates";
+      packageName = "delegates";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz";
+        sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a";
+      };
+    };
+    "dot-case-2.1.1" = {
+      name = "dot-case";
+      packageName = "dot-case";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dot-case/-/dot-case-2.1.1.tgz";
+        sha1 = "34dcf37f50a8e93c2b3bca8bb7fb9155c7da3bee";
+      };
+    };
+    "ecc-jsbn-0.1.2" = {
+      name = "ecc-jsbn";
+      packageName = "ecc-jsbn";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz";
+        sha1 = "3a83a904e54353287874c564b7549386849a98c9";
+      };
+    };
+    "end-of-stream-1.4.1" = {
+      name = "end-of-stream";
+      packageName = "end-of-stream";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz";
+        sha512 = "1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==";
+      };
+    };
+    "error-ex-1.3.2" = {
+      name = "error-ex";
+      packageName = "error-ex";
+      version = "1.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz";
+        sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==";
+      };
+    };
+    "escape-latex-1.2.0" = {
+      name = "escape-latex";
+      packageName = "escape-latex";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escape-latex/-/escape-latex-1.2.0.tgz";
+        sha512 = "nV5aVWW1K0wEiUIEdZ4erkGGH8mDxGyxSeqPzRNtWP7ataw+/olFObw7hujFWlVjNsaDFw5VZ5NzVSIqRgfTiw==";
+      };
+    };
+    "escape-string-regexp-1.0.5" = {
+      name = "escape-string-regexp";
+      packageName = "escape-string-regexp";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
+        sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
+      };
+    };
+    "escodegen-1.11.1" = {
+      name = "escodegen";
+      packageName = "escodegen";
+      version = "1.11.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escodegen/-/escodegen-1.11.1.tgz";
+        sha512 = "JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw==";
+      };
+    };
+    "escodegen-1.3.3" = {
+      name = "escodegen";
+      packageName = "escodegen";
+      version = "1.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz";
+        sha1 = "f024016f5a88e046fd12005055e939802e6c5f23";
+      };
+    };
+    "escope-1.0.3" = {
+      name = "escope";
+      packageName = "escope";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escope/-/escope-1.0.3.tgz";
+        sha1 = "759dce8496c4248fec2d0caaf4108bcf3f1a7f5d";
+      };
+    };
+    "esmangle-1.0.1" = {
+      name = "esmangle";
+      packageName = "esmangle";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esmangle/-/esmangle-1.0.1.tgz";
+        sha1 = "d9bb37b8f8eafbf4e6d4ed6b7aa2956abbd3c4c2";
+      };
+    };
+    "esprima-1.1.1" = {
+      name = "esprima";
+      packageName = "esprima";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz";
+        sha1 = "5b6f1547f4d102e670e140c509be6771d6aeb549";
+      };
+    };
+    "esprima-3.1.3" = {
+      name = "esprima";
+      packageName = "esprima";
+      version = "3.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz";
+        sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633";
+      };
+    };
+    "esshorten-1.1.1" = {
+      name = "esshorten";
+      packageName = "esshorten";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esshorten/-/esshorten-1.1.1.tgz";
+        sha1 = "174f96b7cc267e46872d814e7db7c290bdff61a9";
+      };
+    };
+    "estraverse-1.5.1" = {
+      name = "estraverse";
+      packageName = "estraverse";
+      version = "1.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz";
+        sha1 = "867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71";
+      };
+    };
+    "estraverse-2.0.0" = {
+      name = "estraverse";
+      packageName = "estraverse";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/estraverse/-/estraverse-2.0.0.tgz";
+        sha1 = "5ae46963243600206674ccb24a09e16674fcdca1";
+      };
+    };
+    "estraverse-4.1.1" = {
+      name = "estraverse";
+      packageName = "estraverse";
+      version = "4.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/estraverse/-/estraverse-4.1.1.tgz";
+        sha1 = "f6caca728933a850ef90661d0e17982ba47111a2";
+      };
+    };
+    "estraverse-4.2.0" = {
+      name = "estraverse";
+      packageName = "estraverse";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz";
+        sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13";
+      };
+    };
+    "esutils-1.0.0" = {
+      name = "esutils";
+      packageName = "esutils";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz";
+        sha1 = "8151d358e20c8acc7fb745e7472c0025fe496570";
+      };
+    };
+    "esutils-2.0.2" = {
+      name = "esutils";
+      packageName = "esutils";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz";
+        sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b";
+      };
+    };
+    "execa-0.7.0" = {
+      name = "execa";
+      packageName = "execa";
+      version = "0.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz";
+        sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777";
+      };
+    };
+    "execa-1.0.0" = {
+      name = "execa";
+      packageName = "execa";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz";
+        sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==";
+      };
+    };
+    "extend-3.0.2" = {
+      name = "extend";
+      packageName = "extend";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz";
+        sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==";
+      };
+    };
+    "extsprintf-1.3.0" = {
+      name = "extsprintf";
+      packageName = "extsprintf";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz";
+        sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
+      };
+    };
+    "fast-deep-equal-2.0.1" = {
+      name = "fast-deep-equal";
+      packageName = "fast-deep-equal";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz";
+        sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49";
+      };
+    };
+    "fast-json-stable-stringify-2.0.0" = {
+      name = "fast-json-stable-stringify";
+      packageName = "fast-json-stable-stringify";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz";
+        sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2";
+      };
+    };
+    "fast-levenshtein-1.0.7" = {
+      name = "fast-levenshtein";
+      packageName = "fast-levenshtein";
+      version = "1.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz";
+        sha1 = "0178dcdee023b92905193af0959e8a7639cfdcb9";
+      };
+    };
+    "fast-levenshtein-2.0.6" = {
+      name = "fast-levenshtein";
+      packageName = "fast-levenshtein";
+      version = "2.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz";
+        sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
+      };
+    };
+    "file-uri-to-path-1.0.0" = {
+      name = "file-uri-to-path";
+      packageName = "file-uri-to-path";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz";
+        sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==";
+      };
+    };
+    "find-up-1.1.2" = {
+      name = "find-up";
+      packageName = "find-up";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz";
+        sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f";
+      };
+    };
+    "find-up-2.1.0" = {
+      name = "find-up";
+      packageName = "find-up";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz";
+        sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7";
+      };
+    };
+    "find-up-3.0.0" = {
+      name = "find-up";
+      packageName = "find-up";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz";
+        sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==";
+      };
+    };
+    "first-chunk-stream-2.0.0" = {
+      name = "first-chunk-stream";
+      packageName = "first-chunk-stream";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz";
+        sha1 = "1bdecdb8e083c0664b91945581577a43a9f31d70";
+      };
+    };
+    "forever-agent-0.6.1" = {
+      name = "forever-agent";
+      packageName = "forever-agent";
+      version = "0.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";
+        sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
+      };
+    };
+    "form-data-2.3.3" = {
+      name = "form-data";
+      packageName = "form-data";
+      version = "2.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz";
+        sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==";
+      };
+    };
+    "fraction.js-4.0.12" = {
+      name = "fraction.js";
+      packageName = "fraction.js";
+      version = "4.0.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.0.12.tgz";
+        sha512 = "8Z1K0VTG4hzYY7kA/1sj4/r1/RWLBD3xwReT/RCrUCbzPszjNQCCsy3ktkU/eaEqX3MYa4pY37a52eiBlPMlhA==";
+      };
+    };
+    "fs-extra-3.0.1" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz";
+        sha1 = "3794f378c58b342ea7dbbb23095109c4b3b62291";
+      };
+    };
+    "fs-extra-4.0.3" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "4.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz";
+        sha512 = "q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==";
+      };
+    };
+    "fs-extra-6.0.1" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "6.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz";
+        sha512 = "GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==";
+      };
+    };
+    "fs.realpath-1.0.0" = {
+      name = "fs.realpath";
+      packageName = "fs.realpath";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz";
+        sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
+      };
+    };
+    "fstream-1.0.12" = {
+      name = "fstream";
+      packageName = "fstream";
+      version = "1.0.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz";
+        sha512 = "WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==";
+      };
+    };
+    "gauge-2.7.4" = {
+      name = "gauge";
+      packageName = "gauge";
+      version = "2.7.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz";
+        sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7";
+      };
+    };
+    "get-caller-file-1.0.3" = {
+      name = "get-caller-file";
+      packageName = "get-caller-file";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz";
+        sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==";
+      };
+    };
+    "get-stream-3.0.0" = {
+      name = "get-stream";
+      packageName = "get-stream";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz";
+        sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14";
+      };
+    };
+    "get-stream-4.1.0" = {
+      name = "get-stream";
+      packageName = "get-stream";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz";
+        sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==";
+      };
+    };
+    "getpass-0.1.7" = {
+      name = "getpass";
+      packageName = "getpass";
+      version = "0.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz";
+        sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
+      };
+    };
+    "glob-7.1.4" = {
+      name = "glob";
+      packageName = "glob";
+      version = "7.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz";
+        sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==";
+      };
+    };
+    "graceful-fs-4.1.15" = {
+      name = "graceful-fs";
+      packageName = "graceful-fs";
+      version = "4.1.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz";
+        sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==";
+      };
+    };
+    "har-schema-2.0.0" = {
+      name = "har-schema";
+      packageName = "har-schema";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz";
+        sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92";
+      };
+    };
+    "har-validator-5.1.3" = {
+      name = "har-validator";
+      packageName = "har-validator";
+      version = "5.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz";
+        sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==";
+      };
+    };
+    "has-flag-3.0.0" = {
+      name = "has-flag";
+      packageName = "has-flag";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz";
+        sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd";
+      };
+    };
+    "has-unicode-2.0.1" = {
+      name = "has-unicode";
+      packageName = "has-unicode";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz";
+        sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9";
+      };
+    };
+    "header-case-1.0.1" = {
+      name = "header-case";
+      packageName = "header-case";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/header-case/-/header-case-1.0.1.tgz";
+        sha1 = "9535973197c144b09613cd65d317ef19963bd02d";
+      };
+    };
+    "hosted-git-info-2.7.1" = {
+      name = "hosted-git-info";
+      packageName = "hosted-git-info";
+      version = "2.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz";
+        sha512 = "7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==";
+      };
+    };
+    "http-signature-1.2.0" = {
+      name = "http-signature";
+      packageName = "http-signature";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz";
+        sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
+      };
+    };
+    "inflight-1.0.6" = {
+      name = "inflight";
+      packageName = "inflight";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";
+        sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
+      };
+    };
+    "inherits-2.0.3" = {
+      name = "inherits";
+      packageName = "inherits";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
+        sha1 = "633c2c83e3da42a502f52466022480f4208261de";
+      };
+    };
+    "invert-kv-1.0.0" = {
+      name = "invert-kv";
+      packageName = "invert-kv";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz";
+        sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6";
+      };
+    };
+    "invert-kv-2.0.0" = {
+      name = "invert-kv";
+      packageName = "invert-kv";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz";
+        sha512 = "wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==";
+      };
+    };
+    "is-arrayish-0.2.1" = {
+      name = "is-arrayish";
+      packageName = "is-arrayish";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz";
+        sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d";
+      };
+    };
+    "is-fullwidth-code-point-1.0.0" = {
+      name = "is-fullwidth-code-point";
+      packageName = "is-fullwidth-code-point";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz";
+        sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb";
+      };
+    };
+    "is-fullwidth-code-point-2.0.0" = {
+      name = "is-fullwidth-code-point";
+      packageName = "is-fullwidth-code-point";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz";
+        sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f";
+      };
+    };
+    "is-lower-case-1.1.3" = {
+      name = "is-lower-case";
+      packageName = "is-lower-case";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-lower-case/-/is-lower-case-1.1.3.tgz";
+        sha1 = "7e147be4768dc466db3bfb21cc60b31e6ad69393";
+      };
+    };
+    "is-stream-1.1.0" = {
+      name = "is-stream";
+      packageName = "is-stream";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz";
+        sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
+      };
+    };
+    "is-typedarray-1.0.0" = {
+      name = "is-typedarray";
+      packageName = "is-typedarray";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz";
+        sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a";
+      };
+    };
+    "is-upper-case-1.1.2" = {
+      name = "is-upper-case";
+      packageName = "is-upper-case";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-upper-case/-/is-upper-case-1.1.2.tgz";
+        sha1 = "8d0b1fa7e7933a1e58483600ec7d9661cbaf756f";
+      };
+    };
+    "is-utf8-0.2.1" = {
+      name = "is-utf8";
+      packageName = "is-utf8";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz";
+        sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72";
+      };
+    };
+    "isarray-1.0.0" = {
+      name = "isarray";
+      packageName = "isarray";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz";
+        sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
+      };
+    };
+    "isexe-2.0.0" = {
+      name = "isexe";
+      packageName = "isexe";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz";
+        sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10";
+      };
+    };
+    "isstream-0.1.2" = {
+      name = "isstream";
+      packageName = "isstream";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz";
+        sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
+      };
+    };
+    "javascript-natural-sort-0.7.1" = {
+      name = "javascript-natural-sort";
+      packageName = "javascript-natural-sort";
+      version = "0.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz";
+        sha1 = "f9e2303d4507f6d74355a73664d1440fb5a0ef59";
+      };
+    };
+    "jsbn-0.1.1" = {
+      name = "jsbn";
+      packageName = "jsbn";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz";
+        sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
+      };
+    };
+    "json-schema-0.2.3" = {
+      name = "json-schema";
+      packageName = "json-schema";
+      version = "0.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz";
+        sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13";
+      };
+    };
+    "json-schema-traverse-0.4.1" = {
+      name = "json-schema-traverse";
+      packageName = "json-schema-traverse";
+      version = "0.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz";
+        sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==";
+      };
+    };
+    "json-stringify-safe-5.0.1" = {
+      name = "json-stringify-safe";
+      packageName = "json-stringify-safe";
+      version = "5.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
+        sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
+      };
+    };
+    "jsonfile-3.0.1" = {
+      name = "jsonfile";
+      packageName = "jsonfile";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz";
+        sha1 = "a5ecc6f65f53f662c4415c7675a0331d0992ec66";
+      };
+    };
+    "jsonfile-4.0.0" = {
+      name = "jsonfile";
+      packageName = "jsonfile";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz";
+        sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb";
+      };
+    };
+    "jsonparse-1.3.1" = {
+      name = "jsonparse";
+      packageName = "jsonparse";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz";
+        sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280";
+      };
+    };
+    "jsprim-1.4.1" = {
+      name = "jsprim";
+      packageName = "jsprim";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz";
+        sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
+      };
+    };
+    "lcid-1.0.0" = {
+      name = "lcid";
+      packageName = "lcid";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz";
+        sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835";
+      };
+    };
+    "lcid-2.0.0" = {
+      name = "lcid";
+      packageName = "lcid";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz";
+        sha512 = "avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==";
+      };
+    };
+    "levn-0.2.5" = {
+      name = "levn";
+      packageName = "levn";
+      version = "0.2.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz";
+        sha1 = "ba8d339d0ca4a610e3a3f145b9caf48807155054";
+      };
+    };
+    "levn-0.3.0" = {
+      name = "levn";
+      packageName = "levn";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz";
+        sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee";
+      };
+    };
+    "libspiro-js-0.3.1" = {
+      name = "libspiro-js";
+      packageName = "libspiro-js";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/libspiro-js/-/libspiro-js-0.3.1.tgz";
+        sha1 = "86652b0009a6d84ea79a5320bdca5f00612ee439";
+      };
+    };
+    "load-json-file-1.1.0" = {
+      name = "load-json-file";
+      packageName = "load-json-file";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz";
+        sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0";
+      };
+    };
+    "load-json-file-2.0.0" = {
+      name = "load-json-file";
+      packageName = "load-json-file";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz";
+        sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8";
+      };
+    };
+    "locate-path-2.0.0" = {
+      name = "locate-path";
+      packageName = "locate-path";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz";
+        sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e";
+      };
+    };
+    "locate-path-3.0.0" = {
+      name = "locate-path";
+      packageName = "locate-path";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz";
+        sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==";
+      };
+    };
+    "log-symbols-2.2.0" = {
+      name = "log-symbols";
+      packageName = "log-symbols";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz";
+        sha512 = "VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==";
+      };
+    };
+    "lower-case-1.1.4" = {
+      name = "lower-case";
+      packageName = "lower-case";
+      version = "1.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz";
+        sha1 = "9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac";
+      };
+    };
+    "lower-case-first-1.0.2" = {
+      name = "lower-case-first";
+      packageName = "lower-case-first";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lower-case-first/-/lower-case-first-1.0.2.tgz";
+        sha1 = "e5da7c26f29a7073be02d52bac9980e5922adfa1";
+      };
+    };
+    "lru-cache-4.1.5" = {
+      name = "lru-cache";
+      packageName = "lru-cache";
+      version = "4.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz";
+        sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==";
+      };
+    };
+    "map-age-cleaner-0.1.3" = {
+      name = "map-age-cleaner";
+      packageName = "map-age-cleaner";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz";
+        sha512 = "bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==";
+      };
+    };
+    "mathjs-5.10.3" = {
+      name = "mathjs";
+      packageName = "mathjs";
+      version = "5.10.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mathjs/-/mathjs-5.10.3.tgz";
+        sha512 = "ySjg30BC3dYjQm73ILZtwcWzFJde0VU6otkXW/57IjjuYRa3Qaf0Kb8pydEuBZYtqW2OxreAtsricrAmOj3jIw==";
+      };
+    };
+    "megaminx-0.3.3" = {
+      name = "megaminx";
+      packageName = "megaminx";
+      version = "0.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/megaminx/-/megaminx-0.3.3.tgz";
+        sha512 = "lZBSLMro+XYJIix9zCZ8N6nZgixpjUPkX6CKuh+Y9Wl9bir/2Fp27NWapA0cNQCPrzOOI9sAwxc4BI14aIdumw==";
+      };
+    };
+    "megaminx-0.9.0" = {
+      name = "megaminx";
+      packageName = "megaminx";
+      version = "0.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/megaminx/-/megaminx-0.9.0.tgz";
+        sha512 = "1UcxrUXXYboLWS3AJ2NuLckLi3YR7eJiO5LsYAWHZjYE0mmSqJ2ogSt6JrG8YINyogW9/TUWpL1ojwbRsSbyXw==";
+      };
+    };
+    "mem-1.1.0" = {
+      name = "mem";
+      packageName = "mem";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz";
+        sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76";
+      };
+    };
+    "mem-4.3.0" = {
+      name = "mem";
+      packageName = "mem";
+      version = "4.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz";
+        sha512 = "qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==";
+      };
+    };
+    "microbuffer-1.0.0" = {
+      name = "microbuffer";
+      packageName = "microbuffer";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/microbuffer/-/microbuffer-1.0.0.tgz";
+        sha1 = "8b3832ed40c87d51f47bb234913a698a756d19d2";
+      };
+    };
+    "mime-db-1.40.0" = {
+      name = "mime-db";
+      packageName = "mime-db";
+      version = "1.40.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz";
+        sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==";
+      };
+    };
+    "mime-types-2.1.24" = {
+      name = "mime-types";
+      packageName = "mime-types";
+      version = "2.1.24";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz";
+        sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==";
+      };
+    };
+    "mimic-fn-1.2.0" = {
+      name = "mimic-fn";
+      packageName = "mimic-fn";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz";
+        sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==";
+      };
+    };
+    "mimic-fn-2.1.0" = {
+      name = "mimic-fn";
+      packageName = "mimic-fn";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz";
+        sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==";
+      };
+    };
+    "minimatch-3.0.4" = {
+      name = "minimatch";
+      packageName = "minimatch";
+      version = "3.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
+        sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
+      };
+    };
+    "minimist-0.0.8" = {
+      name = "minimist";
+      packageName = "minimist";
+      version = "0.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
+      };
+    };
+    "mkdirp-0.5.1" = {
+      name = "mkdirp";
+      packageName = "mkdirp";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
+        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
+      };
+    };
+    "nan-2.14.0" = {
+      name = "nan";
+      packageName = "nan";
+      version = "2.14.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz";
+        sha512 = "INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==";
+      };
+    };
+    "nice-try-1.0.5" = {
+      name = "nice-try";
+      packageName = "nice-try";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz";
+        sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==";
+      };
+    };
+    "no-case-2.3.2" = {
+      name = "no-case";
+      packageName = "no-case";
+      version = "2.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz";
+        sha512 = "rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==";
+      };
+    };
+    "node-gyp-3.8.0" = {
+      name = "node-gyp";
+      packageName = "node-gyp";
+      version = "3.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz";
+        sha512 = "3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==";
+      };
+    };
+    "node-version-1.2.0" = {
+      name = "node-version";
+      packageName = "node-version";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-version/-/node-version-1.2.0.tgz";
+        sha512 = "ma6oU4Sk0qOoKEAymVoTvk8EdXEobdS7m/mAGhDJ8Rouugho48crHBORAmy5BoOcv8wraPM6xumapQp5hl4iIQ==";
+      };
+    };
+    "nopt-3.0.6" = {
+      name = "nopt";
+      packageName = "nopt";
+      version = "3.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz";
+        sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9";
+      };
+    };
+    "normalize-package-data-2.5.0" = {
+      name = "normalize-package-data";
+      packageName = "normalize-package-data";
+      version = "2.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz";
+        sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==";
+      };
+    };
+    "npm-run-path-2.0.2" = {
+      name = "npm-run-path";
+      packageName = "npm-run-path";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz";
+        sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f";
+      };
+    };
+    "npmlog-4.1.2" = {
+      name = "npmlog";
+      packageName = "npmlog";
+      version = "4.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz";
+        sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==";
+      };
+    };
+    "number-is-nan-1.0.1" = {
+      name = "number-is-nan";
+      packageName = "number-is-nan";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz";
+        sha1 = "097b602b53422a522c1afb8790318336941a011d";
+      };
+    };
+    "oauth-sign-0.9.0" = {
+      name = "oauth-sign";
+      packageName = "oauth-sign";
+      version = "0.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz";
+        sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==";
+      };
+    };
+    "object-assign-4.1.1" = {
+      name = "object-assign";
+      packageName = "object-assign";
+      version = "4.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz";
+        sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
+      };
+    };
+    "once-1.4.0" = {
+      name = "once";
+      packageName = "once";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz";
+        sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
+      };
+    };
+    "onetime-2.0.1" = {
+      name = "onetime";
+      packageName = "onetime";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz";
+        sha1 = "067428230fd67443b2794b22bba528b6867962d4";
+      };
+    };
+    "optionator-0.3.0" = {
+      name = "optionator";
+      packageName = "optionator";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/optionator/-/optionator-0.3.0.tgz";
+        sha1 = "9715a8b5f5e7586cff06c8249e039cd7364d3f54";
+      };
+    };
+    "optionator-0.8.2" = {
+      name = "optionator";
+      packageName = "optionator";
+      version = "0.8.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz";
+        sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64";
+      };
+    };
+    "ora-2.1.0" = {
+      name = "ora";
+      packageName = "ora";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ora/-/ora-2.1.0.tgz";
+        sha512 = "hNNlAd3gfv/iPmsNxYoAPLvxg7HuPozww7fFonMZvL84tP6Ox5igfk5j/+a9rtJJwqMgKK+JgWsAQik5o0HTLA==";
+      };
+    };
+    "os-homedir-1.0.2" = {
+      name = "os-homedir";
+      packageName = "os-homedir";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz";
+        sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3";
+      };
+    };
+    "os-locale-1.4.0" = {
+      name = "os-locale";
+      packageName = "os-locale";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz";
+        sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9";
+      };
+    };
+    "os-locale-2.1.0" = {
+      name = "os-locale";
+      packageName = "os-locale";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz";
+        sha512 = "3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==";
+      };
+    };
+    "os-locale-3.1.0" = {
+      name = "os-locale";
+      packageName = "os-locale";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz";
+        sha512 = "Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==";
+      };
+    };
+    "os-tmpdir-1.0.2" = {
+      name = "os-tmpdir";
+      packageName = "os-tmpdir";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz";
+        sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
+      };
+    };
+    "osenv-0.1.5" = {
+      name = "osenv";
+      packageName = "osenv";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz";
+        sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";
+      };
+    };
+    "otfcc-ttcize-0.8.0" = {
+      name = "otfcc-ttcize";
+      packageName = "otfcc-ttcize";
+      version = "0.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/otfcc-ttcize/-/otfcc-ttcize-0.8.0.tgz";
+        sha512 = "0RFgy9TDsgTF/1UJ8bSQ4heTYRatDz3HOXXh8d3WyXReqeOU+edgkbG4ERMFPdzFnA+SgqKTnPRg+2pduZsmSQ==";
+      };
+    };
+    "p-defer-1.0.0" = {
+      name = "p-defer";
+      packageName = "p-defer";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz";
+        sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c";
+      };
+    };
+    "p-finally-1.0.0" = {
+      name = "p-finally";
+      packageName = "p-finally";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz";
+        sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
+      };
+    };
+    "p-is-promise-2.1.0" = {
+      name = "p-is-promise";
+      packageName = "p-is-promise";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz";
+        sha512 = "Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==";
+      };
+    };
+    "p-limit-1.3.0" = {
+      name = "p-limit";
+      packageName = "p-limit";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz";
+        sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==";
+      };
+    };
+    "p-limit-2.2.0" = {
+      name = "p-limit";
+      packageName = "p-limit";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz";
+        sha512 = "pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==";
+      };
+    };
+    "p-locate-2.0.0" = {
+      name = "p-locate";
+      packageName = "p-locate";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz";
+        sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43";
+      };
+    };
+    "p-locate-3.0.0" = {
+      name = "p-locate";
+      packageName = "p-locate";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz";
+        sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==";
+      };
+    };
+    "p-try-1.0.0" = {
+      name = "p-try";
+      packageName = "p-try";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz";
+        sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3";
+      };
+    };
+    "p-try-2.2.0" = {
+      name = "p-try";
+      packageName = "p-try";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz";
+        sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==";
+      };
+    };
+    "pad-1.2.1" = {
+      name = "pad";
+      packageName = "pad";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pad/-/pad-1.2.1.tgz";
+        sha512 = "cx/l/K+9UjGXJmoYolvP0l3cEUyB9BUdUL3wj3uwskIiApboLsinvsXxU9nSNg9Luz2ZyH0zzJNbqgLSNtfIDw==";
+      };
+    };
+    "pako-1.0.10" = {
+      name = "pako";
+      packageName = "pako";
+      version = "1.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz";
+        sha512 = "0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==";
+      };
+    };
+    "param-case-2.1.1" = {
+      name = "param-case";
+      packageName = "param-case";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz";
+        sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247";
+      };
+    };
+    "parse-json-2.2.0" = {
+      name = "parse-json";
+      packageName = "parse-json";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz";
+        sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9";
+      };
+    };
+    "pascal-case-2.0.1" = {
+      name = "pascal-case";
+      packageName = "pascal-case";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pascal-case/-/pascal-case-2.0.1.tgz";
+        sha1 = "2d578d3455f660da65eca18ef95b4e0de912761e";
+      };
+    };
+    "patel-0.33.1" = {
+      name = "patel";
+      packageName = "patel";
+      version = "0.33.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/patel/-/patel-0.33.1.tgz";
+        sha512 = "zOv5DhGH2r4cRKnZfOlHmWqxBp9nMGnC3F/NZbUqFCYMA65RXiv8q1F96/6dm2ANR6xvCe+xLODQSb49IFoYQg==";
+      };
+    };
+    "path-case-2.1.1" = {
+      name = "path-case";
+      packageName = "path-case";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-case/-/path-case-2.1.1.tgz";
+        sha1 = "94b8037c372d3fe2906e465bb45e25d226e8eea5";
+      };
+    };
+    "path-exists-2.1.0" = {
+      name = "path-exists";
+      packageName = "path-exists";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz";
+        sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b";
+      };
+    };
+    "path-exists-3.0.0" = {
+      name = "path-exists";
+      packageName = "path-exists";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz";
+        sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515";
+      };
+    };
+    "path-is-absolute-1.0.1" = {
+      name = "path-is-absolute";
+      packageName = "path-is-absolute";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
+        sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
+      };
+    };
+    "path-key-2.0.1" = {
+      name = "path-key";
+      packageName = "path-key";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz";
+        sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40";
+      };
+    };
+    "path-parse-1.0.6" = {
+      name = "path-parse";
+      packageName = "path-parse";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz";
+        sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==";
+      };
+    };
+    "path-type-1.1.0" = {
+      name = "path-type";
+      packageName = "path-type";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz";
+        sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441";
+      };
+    };
+    "path-type-2.0.0" = {
+      name = "path-type";
+      packageName = "path-type";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz";
+        sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73";
+      };
+    };
+    "patrisika-0.21.0" = {
+      name = "patrisika";
+      packageName = "patrisika";
+      version = "0.21.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/patrisika/-/patrisika-0.21.0.tgz";
+        sha1 = "b82c27f7d4041522dc5c31b43b7c6efb19e47482";
+      };
+    };
+    "patrisika-scopes-0.11.1" = {
+      name = "patrisika-scopes";
+      packageName = "patrisika-scopes";
+      version = "0.11.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/patrisika-scopes/-/patrisika-scopes-0.11.1.tgz";
+        sha512 = "UCIBMx1nzNaR5CcDoQ9/jtY5RlJqf2CrJYHiMZJhi15NPvsPKRfJT/DPZMkhCunexOKmH03EDZYZU1hGn7mL0w==";
+      };
+    };
+    "performance-now-2.1.0" = {
+      name = "performance-now";
+      packageName = "performance-now";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz";
+        sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
+      };
+    };
+    "pify-2.3.0" = {
+      name = "pify";
+      packageName = "pify";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz";
+        sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c";
+      };
+    };
+    "pinkie-2.0.4" = {
+      name = "pinkie";
+      packageName = "pinkie";
+      version = "2.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz";
+        sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870";
+      };
+    };
+    "pinkie-promise-2.0.1" = {
+      name = "pinkie-promise";
+      packageName = "pinkie-promise";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz";
+        sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa";
+      };
+    };
+    "prelude-ls-1.1.2" = {
+      name = "prelude-ls";
+      packageName = "prelude-ls";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz";
+        sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54";
+      };
+    };
+    "primitive-quadify-off-curves-0.4.1" = {
+      name = "primitive-quadify-off-curves";
+      packageName = "primitive-quadify-off-curves";
+      version = "0.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/primitive-quadify-off-curves/-/primitive-quadify-off-curves-0.4.1.tgz";
+        sha512 = "Kmn+IfF+hcARb1NX+XtoSQIxHS+WeOqqQ3YDihRe3KkvGkFxMrDQFFsDTXxwUOt9KmvD7FgWG6cO2ajZp4lEQg==";
+      };
+    };
+    "process-nextick-args-2.0.0" = {
+      name = "process-nextick-args";
+      packageName = "process-nextick-args";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz";
+        sha512 = "MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==";
+      };
+    };
+    "promise-polyfill-6.1.0" = {
+      name = "promise-polyfill";
+      packageName = "promise-polyfill";
+      version = "6.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.1.0.tgz";
+        sha1 = "dfa96943ea9c121fca4de9b5868cb39d3472e057";
+      };
+    };
+    "proper-lockfile-3.2.0" = {
+      name = "proper-lockfile";
+      packageName = "proper-lockfile";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-3.2.0.tgz";
+        sha512 = "iMghHHXv2bsxl6NchhEaFck8tvX3F9cknEEh1SUpguUOBjN7PAAW9BLzmbc1g/mCD1gY3EE2EABBHPJfFdHFmA==";
+      };
+    };
+    "pseudomap-1.0.2" = {
+      name = "pseudomap";
+      packageName = "pseudomap";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz";
+        sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3";
+      };
+    };
+    "psl-1.1.32" = {
+      name = "psl";
+      packageName = "psl";
+      version = "1.1.32";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/psl/-/psl-1.1.32.tgz";
+        sha512 = "MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g==";
+      };
+    };
+    "pump-3.0.0" = {
+      name = "pump";
+      packageName = "pump";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz";
+        sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==";
+      };
+    };
+    "punycode-1.4.1" = {
+      name = "punycode";
+      packageName = "punycode";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
+        sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
+      };
+    };
+    "punycode-2.1.1" = {
+      name = "punycode";
+      packageName = "punycode";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz";
+        sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==";
+      };
+    };
+    "qs-6.5.2" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz";
+        sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==";
+      };
+    };
+    "read-pkg-1.1.0" = {
+      name = "read-pkg";
+      packageName = "read-pkg";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz";
+        sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28";
+      };
+    };
+    "read-pkg-2.0.0" = {
+      name = "read-pkg";
+      packageName = "read-pkg";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz";
+        sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8";
+      };
+    };
+    "read-pkg-up-1.0.1" = {
+      name = "read-pkg-up";
+      packageName = "read-pkg-up";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz";
+        sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02";
+      };
+    };
+    "read-pkg-up-2.0.0" = {
+      name = "read-pkg-up";
+      packageName = "read-pkg-up";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz";
+        sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be";
+      };
+    };
+    "readable-stream-2.3.6" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "2.3.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz";
+        sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==";
+      };
+    };
+    "request-2.88.0" = {
+      name = "request";
+      packageName = "request";
+      version = "2.88.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz";
+        sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==";
+      };
+    };
+    "require-directory-2.1.1" = {
+      name = "require-directory";
+      packageName = "require-directory";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz";
+        sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42";
+      };
+    };
+    "require-main-filename-1.0.1" = {
+      name = "require-main-filename";
+      packageName = "require-main-filename";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz";
+        sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
+      };
+    };
+    "resolve-1.11.1" = {
+      name = "resolve";
+      packageName = "resolve";
+      version = "1.11.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz";
+        sha512 = "vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==";
+      };
+    };
+    "restore-cursor-2.0.0" = {
+      name = "restore-cursor";
+      packageName = "restore-cursor";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz";
+        sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf";
+      };
+    };
+    "resumer-0.0.0" = {
+      name = "resumer";
+      packageName = "resumer";
+      version = "0.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz";
+        sha1 = "f1e8f461e4064ba39e82af3cdc2a8c893d076759";
+      };
+    };
+    "retry-0.12.0" = {
+      name = "retry";
+      packageName = "retry";
+      version = "0.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz";
+        sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b";
+      };
+    };
+    "rimraf-2.2.8" = {
+      name = "rimraf";
+      packageName = "rimraf";
+      version = "2.2.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
+        sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
+      };
+    };
+    "safe-buffer-5.1.2" = {
+      name = "safe-buffer";
+      packageName = "safe-buffer";
+      version = "5.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
+        sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
+      };
+    };
+    "safer-buffer-2.1.2" = {
+      name = "safer-buffer";
+      packageName = "safer-buffer";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";
+        sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
+      };
+    };
+    "seed-random-2.2.0" = {
+      name = "seed-random";
+      packageName = "seed-random";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/seed-random/-/seed-random-2.2.0.tgz";
+        sha1 = "2a9b19e250a817099231a5b99a4daf80b7fbed54";
+      };
+    };
+    "semaphore-async-await-1.5.1" = {
+      name = "semaphore-async-await";
+      packageName = "semaphore-async-await";
+      version = "1.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semaphore-async-await/-/semaphore-async-await-1.5.1.tgz";
+        sha1 = "857bef5e3644601ca4b9570b87e9df5ca12974fa";
+      };
+    };
+    "semver-5.3.0" = {
+      name = "semver";
+      packageName = "semver";
+      version = "5.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz";
+        sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f";
+      };
+    };
+    "semver-5.7.0" = {
+      name = "semver";
+      packageName = "semver";
+      version = "5.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz";
+        sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==";
+      };
+    };
+    "sentence-case-2.1.1" = {
+      name = "sentence-case";
+      packageName = "sentence-case";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sentence-case/-/sentence-case-2.1.1.tgz";
+        sha1 = "1f6e2dda39c168bf92d13f86d4a918933f667ed4";
+      };
+    };
+    "set-blocking-2.0.0" = {
+      name = "set-blocking";
+      packageName = "set-blocking";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz";
+        sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7";
+      };
+    };
+    "shebang-command-1.2.0" = {
+      name = "shebang-command";
+      packageName = "shebang-command";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz";
+        sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea";
+      };
+    };
+    "shebang-regex-1.0.0" = {
+      name = "shebang-regex";
+      packageName = "shebang-regex";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz";
+        sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3";
+      };
+    };
+    "signal-exit-3.0.2" = {
+      name = "signal-exit";
+      packageName = "signal-exit";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
+        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
+      };
+    };
+    "snake-case-2.1.0" = {
+      name = "snake-case";
+      packageName = "snake-case";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snake-case/-/snake-case-2.1.0.tgz";
+        sha1 = "41bdb1b73f30ec66a04d4e2cad1b76387d4d6d9f";
+      };
+    };
+    "source-map-0.1.43" = {
+      name = "source-map";
+      packageName = "source-map";
+      version = "0.1.43";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz";
+        sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346";
+      };
+    };
+    "source-map-0.6.1" = {
+      name = "source-map";
+      packageName = "source-map";
+      version = "0.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz";
+        sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==";
+      };
+    };
+    "spdx-correct-3.1.0" = {
+      name = "spdx-correct";
+      packageName = "spdx-correct";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz";
+        sha512 = "lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==";
+      };
+    };
+    "spdx-exceptions-2.2.0" = {
+      name = "spdx-exceptions";
+      packageName = "spdx-exceptions";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz";
+        sha512 = "2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==";
+      };
+    };
+    "spdx-expression-parse-3.0.0" = {
+      name = "spdx-expression-parse";
+      packageName = "spdx-expression-parse";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz";
+        sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==";
+      };
+    };
+    "spdx-license-ids-3.0.4" = {
+      name = "spdx-license-ids";
+      packageName = "spdx-license-ids";
+      version = "3.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz";
+        sha512 = "7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA==";
+      };
+    };
+    "split-1.0.1" = {
+      name = "split";
+      packageName = "split";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/split/-/split-1.0.1.tgz";
+        sha512 = "mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==";
+      };
+    };
+    "sprintf-js-1.0.3" = {
+      name = "sprintf-js";
+      packageName = "sprintf-js";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz";
+        sha1 = "04e6926f662895354f3dd015203633b857297e2c";
+      };
+    };
+    "sshpk-1.16.1" = {
+      name = "sshpk";
+      packageName = "sshpk";
+      version = "1.16.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz";
+        sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==";
+      };
+    };
+    "stack-trace-0.0.9" = {
+      name = "stack-trace";
+      packageName = "stack-trace";
+      version = "0.0.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz";
+        sha1 = "a8f6eaeca90674c333e7c43953f275b451510695";
+      };
+    };
+    "string-width-1.0.2" = {
+      name = "string-width";
+      packageName = "string-width";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz";
+        sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3";
+      };
+    };
+    "string-width-2.1.1" = {
+      name = "string-width";
+      packageName = "string-width";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz";
+        sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==";
+      };
+    };
+    "string_decoder-1.1.1" = {
+      name = "string_decoder";
+      packageName = "string_decoder";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
+        sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
+      };
+    };
+    "strip-ansi-3.0.1" = {
+      name = "strip-ansi";
+      packageName = "strip-ansi";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
+        sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
+      };
+    };
+    "strip-ansi-4.0.0" = {
+      name = "strip-ansi";
+      packageName = "strip-ansi";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz";
+        sha1 = "a8479022eb1ac368a871389b635262c505ee368f";
+      };
+    };
+    "strip-bom-2.0.0" = {
+      name = "strip-bom";
+      packageName = "strip-bom";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz";
+        sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e";
+      };
+    };
+    "strip-bom-3.0.0" = {
+      name = "strip-bom";
+      packageName = "strip-bom";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz";
+        sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3";
+      };
+    };
+    "strip-bom-buf-1.0.0" = {
+      name = "strip-bom-buf";
+      packageName = "strip-bom-buf";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-bom-buf/-/strip-bom-buf-1.0.0.tgz";
+        sha1 = "1cb45aaf57530f4caf86c7f75179d2c9a51dd572";
+      };
+    };
+    "strip-bom-stream-3.0.0" = {
+      name = "strip-bom-stream";
+      packageName = "strip-bom-stream";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-3.0.0.tgz";
+        sha1 = "956bcc5d84430f69256a90ed823765cd858e159c";
+      };
+    };
+    "strip-eof-1.0.0" = {
+      name = "strip-eof";
+      packageName = "strip-eof";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz";
+        sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf";
+      };
+    };
+    "supports-color-5.5.0" = {
+      name = "supports-color";
+      packageName = "supports-color";
+      version = "5.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz";
+        sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==";
+      };
+    };
+    "swap-case-1.1.2" = {
+      name = "swap-case";
+      packageName = "swap-case";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/swap-case/-/swap-case-1.1.2.tgz";
+        sha1 = "c39203a4587385fad3c850a0bd1bcafa081974e3";
+      };
+    };
+    "tar-2.2.2" = {
+      name = "tar";
+      packageName = "tar";
+      version = "2.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz";
+        sha512 = "FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==";
+      };
+    };
+    "temp-0.8.3" = {
+      name = "temp";
+      packageName = "temp";
+      version = "0.8.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz";
+        sha1 = "e0c6bc4d26b903124410e4fed81103014dfc1f59";
+      };
+    };
+    "through-2.3.8" = {
+      name = "through";
+      packageName = "through";
+      version = "2.3.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz";
+        sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5";
+      };
+    };
+    "tiny-emitter-2.1.0" = {
+      name = "tiny-emitter";
+      packageName = "tiny-emitter";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz";
+        sha512 = "NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==";
+      };
+    };
+    "title-case-2.1.1" = {
+      name = "title-case";
+      packageName = "title-case";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/title-case/-/title-case-2.1.1.tgz";
+        sha1 = "3e127216da58d2bc5becf137ab91dae3a7cd8faa";
+      };
+    };
+    "toml-2.3.6" = {
+      name = "toml";
+      packageName = "toml";
+      version = "2.3.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/toml/-/toml-2.3.6.tgz";
+        sha512 = "gVweAectJU3ebq//Ferr2JUY4WKSDe5N+z0FvjDncLGyHmIDoxgY/2Ie4qfEIDm4IS7OA6Rmdm7pdEEdMcV/xQ==";
+      };
+    };
+    "topsort-0.0.2" = {
+      name = "topsort";
+      packageName = "topsort";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/topsort/-/topsort-0.0.2.tgz";
+        sha1 = "2e5e0ee8a1439417f101d5b9b2d035e620263321";
+      };
+    };
+    "tough-cookie-2.4.3" = {
+      name = "tough-cookie";
+      packageName = "tough-cookie";
+      version = "2.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz";
+        sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==";
+      };
+    };
+    "ts-process-promises-1.0.2" = {
+      name = "ts-process-promises";
+      packageName = "ts-process-promises";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ts-process-promises/-/ts-process-promises-1.0.2.tgz";
+        sha512 = "6qWWz2HdFbD2uAfgS5t65Dd6HQKYjfra+YXQzKzxIG+RKTpoeDi+x+TW85SEF3cWUI2UecrOXJobvD+04MiTZg==";
+      };
+    };
+    "tslib-1.9.3" = {
+      name = "tslib";
+      packageName = "tslib";
+      version = "1.9.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz";
+        sha512 = "4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==";
+      };
+    };
+    "ttf2woff-2.0.1" = {
+      name = "ttf2woff";
+      packageName = "ttf2woff";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ttf2woff/-/ttf2woff-2.0.1.tgz";
+        sha1 = "871832240024b09db9570904c7c1928b8057c969";
+      };
+    };
+    "ttf2woff2-2.0.3" = {
+      name = "ttf2woff2";
+      packageName = "ttf2woff2";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ttf2woff2/-/ttf2woff2-2.0.3.tgz";
+        sha1 = "5e020afe6e643287f3ad7687abed20fe654eb329";
+      };
+    };
+    "tunnel-agent-0.6.0" = {
+      name = "tunnel-agent";
+      packageName = "tunnel-agent";
+      version = "0.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz";
+        sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd";
+      };
+    };
+    "tweetnacl-0.14.5" = {
+      name = "tweetnacl";
+      packageName = "tweetnacl";
+      version = "0.14.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz";
+        sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
+      };
+    };
+    "type-check-0.3.2" = {
+      name = "type-check";
+      packageName = "type-check";
+      version = "0.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz";
+        sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72";
+      };
+    };
+    "typed-function-1.1.0" = {
+      name = "typed-function";
+      packageName = "typed-function";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typed-function/-/typed-function-1.1.0.tgz";
+        sha512 = "TuQzwiT4DDg19beHam3E66oRXhyqlyfgjHB/5fcvsRXbfmWPJfto9B4a0TBdTrQAPGlGmXh/k7iUI+WsObgORA==";
+      };
+    };
+    "typo-geom-0.5.1" = {
+      name = "typo-geom";
+      packageName = "typo-geom";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typo-geom/-/typo-geom-0.5.1.tgz";
+        sha512 = "nj81m0eqRMpK6NcwkGlT9r3CbwjCQhsFU6SBUuYW9TDveqIdi/QUFGkikoImtE1C6OzY2LvuVMSG8rx/ZTCGtQ==";
+      };
+    };
+    "universalify-0.1.2" = {
+      name = "universalify";
+      packageName = "universalify";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz";
+        sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==";
+      };
+    };
+    "unorm-1.5.0" = {
+      name = "unorm";
+      packageName = "unorm";
+      version = "1.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unorm/-/unorm-1.5.0.tgz";
+        sha512 = "sMfSWoiRaXXeDZSXC+YRZ23H4xchQpwxjpw1tmfR+kgbBCaOgln4NI0LXejJIhnBuKINrB3WRn+ZI8IWssirVw==";
+      };
+    };
+    "upper-case-1.1.3" = {
+      name = "upper-case";
+      packageName = "upper-case";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz";
+        sha1 = "f6b4501c2ec4cdd26ba78be7222961de77621598";
+      };
+    };
+    "upper-case-first-1.1.2" = {
+      name = "upper-case-first";
+      packageName = "upper-case-first";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/upper-case-first/-/upper-case-first-1.1.2.tgz";
+        sha1 = "5d79bedcff14419518fd2edb0a0507c9b6859115";
+      };
+    };
+    "uri-js-4.2.2" = {
+      name = "uri-js";
+      packageName = "uri-js";
+      version = "4.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz";
+        sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==";
+      };
+    };
+    "util-deprecate-1.0.2" = {
+      name = "util-deprecate";
+      packageName = "util-deprecate";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz";
+        sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
+      };
+    };
+    "uuid-3.3.2" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "3.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz";
+        sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==";
+      };
+    };
+    "validate-npm-package-license-3.0.4" = {
+      name = "validate-npm-package-license";
+      packageName = "validate-npm-package-license";
+      version = "3.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz";
+        sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==";
+      };
+    };
+    "verda-0.2.0" = {
+      name = "verda";
+      packageName = "verda";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/verda/-/verda-0.2.0.tgz";
+        sha512 = "lM0fo93zHqClvkOd6h7kDQKH4cCOEeFwZOVKz5tgQb3fmOUFc44OaOJd4DcRZc2zdRRAHr6Hk98TXAKWHOKMmw==";
+      };
+    };
+    "verror-1.10.0" = {
+      name = "verror";
+      packageName = "verror";
+      version = "1.10.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz";
+        sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
+      };
+    };
+    "wcwidth-1.0.1" = {
+      name = "wcwidth";
+      packageName = "wcwidth";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz";
+        sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8";
+      };
+    };
+    "which-1.3.1" = {
+      name = "which";
+      packageName = "which";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz";
+        sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==";
+      };
+    };
+    "which-module-1.0.0" = {
+      name = "which-module";
+      packageName = "which-module";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz";
+        sha1 = "bba63ca861948994ff307736089e3b96026c2a4f";
+      };
+    };
+    "which-module-2.0.0" = {
+      name = "which-module";
+      packageName = "which-module";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz";
+        sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a";
+      };
+    };
+    "wide-align-1.1.3" = {
+      name = "wide-align";
+      packageName = "wide-align";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz";
+        sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==";
+      };
+    };
+    "wordwrap-0.0.3" = {
+      name = "wordwrap";
+      packageName = "wordwrap";
+      version = "0.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz";
+        sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107";
+      };
+    };
+    "wordwrap-1.0.0" = {
+      name = "wordwrap";
+      packageName = "wordwrap";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz";
+        sha1 = "27584810891456a4171c8d0226441ade90cbcaeb";
+      };
+    };
+    "wrap-ansi-2.1.0" = {
+      name = "wrap-ansi";
+      packageName = "wrap-ansi";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz";
+        sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85";
+      };
+    };
+    "wrappy-1.0.2" = {
+      name = "wrappy";
+      packageName = "wrappy";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz";
+        sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
+      };
+    };
+    "y18n-3.2.1" = {
+      name = "y18n";
+      packageName = "y18n";
+      version = "3.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz";
+        sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41";
+      };
+    };
+    "yallist-2.1.2" = {
+      name = "yallist";
+      packageName = "yallist";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz";
+        sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52";
+      };
+    };
+    "yargs-12.0.5" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "12.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz";
+        sha512 = "Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==";
+      };
+    };
+    "yargs-6.6.0" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "6.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz";
+        sha1 = "782ec21ef403345f830a808ca3d513af56065208";
+      };
+    };
+    "yargs-8.0.2" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "8.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz";
+        sha1 = "6299a9055b1cefc969ff7e79c1d918dceb22c360";
+      };
+    };
+    "yargs-parser-11.1.1" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "11.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz";
+        sha512 = "C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==";
+      };
+    };
+    "yargs-parser-4.2.1" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz";
+        sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c";
+      };
+    };
+    "yargs-parser-7.0.0" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "7.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz";
+        sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9";
+      };
+    };
+  };
+in
+{
+  "iosevka-https://github.com/be5invis/Iosevka/archive/v2.1.0.tar.gz" = nodeEnv.buildNodePackage {
+    name = "iosevka";
+    packageName = "iosevka";
+    version = "2.1.0";
+    src = fetchurl {
+      name = "iosevka-2.1.0.tar.gz";
+      url = https://codeload.github.com/be5invis/Iosevka/tar.gz/v2.1.0;
+      sha256 = "bac7c7dfa035735bb9ad1ca4821df098971294effeba1295f9dd7624610297ea";
+    };
+    dependencies = [
+      sources."JSONStream-1.3.5"
+      sources."abbrev-1.1.1"
+      sources."ajv-6.10.0"
+      sources."amdefine-1.0.1"
+      sources."ansi-regex-2.1.1"
+      sources."ansi-styles-3.2.1"
+      sources."aproba-1.2.0"
+      sources."are-we-there-yet-1.1.5"
+      sources."argparse-1.0.10"
+      sources."asn1-0.2.4"
+      sources."assert-plus-1.0.0"
+      sources."asynckit-0.4.0"
+      sources."aws-sign2-0.7.0"
+      sources."aws4-1.8.0"
+      sources."balanced-match-1.0.0"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."bezier-js-2.4.0"
+      sources."bindings-1.5.0"
+      sources."block-stream-0.0.9"
+      sources."bluebird-3.5.5"
+      sources."brace-expansion-1.1.11"
+      sources."bufferstreams-1.1.3"
+      sources."camel-case-3.0.0"
+      sources."camelcase-4.1.0"
+      sources."caryll-shapeops-0.3.1"
+      sources."caseless-0.12.0"
+      sources."chalk-2.4.2"
+      sources."change-case-3.1.0"
+      sources."child-process-promise-2.2.1"
+      sources."cli-cursor-2.1.0"
+      sources."cli-spinners-1.3.1"
+      sources."clipper-lib-1.0.0"
+      (sources."cliui-3.2.0" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+        ];
+      })
+      sources."clone-2.1.2"
+      sources."code-point-at-1.1.0"
+      sources."coffee-script-1.12.7"
+      sources."color-convert-1.9.3"
+      sources."color-name-1.1.3"
+      sources."combined-stream-1.0.8"
+      sources."complex.js-2.0.11"
+      sources."concat-map-0.0.1"
+      sources."console-control-strings-1.1.0"
+      sources."constant-case-2.0.0"
+      sources."core-util-is-1.0.2"
+      sources."cross-spawn-4.0.2"
+      sources."cubic2quad-1.1.1"
+      sources."dashdash-1.14.1"
+      sources."decamelize-1.2.0"
+      sources."decimal.js-10.2.0"
+      sources."deep-is-0.1.3"
+      (sources."defaults-1.0.3" // {
+        dependencies = [
+          sources."clone-1.0.4"
+        ];
+      })
+      sources."delayed-stream-1.0.0"
+      sources."delegates-1.0.0"
+      sources."dot-case-2.1.1"
+      sources."ecc-jsbn-0.1.2"
+      sources."end-of-stream-1.4.1"
+      sources."error-ex-1.3.2"
+      sources."escape-latex-1.2.0"
+      sources."escape-string-regexp-1.0.5"
+      sources."escodegen-1.11.1"
+      (sources."escope-1.0.3" // {
+        dependencies = [
+          sources."estraverse-2.0.0"
+        ];
+      })
+      (sources."esmangle-1.0.1" // {
+        dependencies = [
+          sources."escodegen-1.3.3"
+          sources."esprima-1.1.1"
+          sources."estraverse-1.5.1"
+          sources."esutils-1.0.0"
+          sources."fast-levenshtein-1.0.7"
+          sources."levn-0.2.5"
+          sources."optionator-0.3.0"
+          sources."source-map-0.1.43"
+          sources."wordwrap-0.0.3"
+        ];
+      })
+      sources."esprima-3.1.3"
+      (sources."esshorten-1.1.1" // {
+        dependencies = [
+          sources."estraverse-4.1.1"
+        ];
+      })
+      sources."estraverse-4.2.0"
+      sources."esutils-2.0.2"
+      (sources."execa-0.7.0" // {
+        dependencies = [
+          sources."cross-spawn-5.1.0"
+        ];
+      })
+      sources."extend-3.0.2"
+      sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-2.0.1"
+      sources."fast-json-stable-stringify-2.0.0"
+      sources."fast-levenshtein-2.0.6"
+      sources."file-uri-to-path-1.0.0"
+      sources."find-up-2.1.0"
+      sources."first-chunk-stream-2.0.0"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.3.3"
+      sources."fraction.js-4.0.12"
+      sources."fs-extra-3.0.1"
+      sources."fs.realpath-1.0.0"
+      sources."fstream-1.0.12"
+      (sources."gauge-2.7.4" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+        ];
+      })
+      sources."get-caller-file-1.0.3"
+      sources."get-stream-3.0.0"
+      sources."getpass-0.1.7"
+      sources."glob-7.1.4"
+      sources."graceful-fs-4.1.15"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.1.3"
+      sources."has-flag-3.0.0"
+      sources."has-unicode-2.0.1"
+      sources."header-case-1.0.1"
+      sources."hosted-git-info-2.7.1"
+      sources."http-signature-1.2.0"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."invert-kv-1.0.0"
+      sources."is-arrayish-0.2.1"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."is-lower-case-1.1.3"
+      sources."is-stream-1.1.0"
+      sources."is-typedarray-1.0.0"
+      sources."is-upper-case-1.1.2"
+      sources."is-utf8-0.2.1"
+      sources."isarray-1.0.0"
+      sources."isexe-2.0.0"
+      sources."isstream-0.1.2"
+      sources."javascript-natural-sort-0.7.1"
+      sources."jsbn-0.1.1"
+      sources."json-schema-0.2.3"
+      sources."json-schema-traverse-0.4.1"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsonfile-3.0.1"
+      sources."jsonparse-1.3.1"
+      sources."jsprim-1.4.1"
+      sources."lcid-1.0.0"
+      sources."levn-0.3.0"
+      sources."libspiro-js-0.3.1"
+      sources."load-json-file-2.0.0"
+      sources."locate-path-2.0.0"
+      sources."log-symbols-2.2.0"
+      sources."lower-case-1.1.4"
+      sources."lower-case-first-1.0.2"
+      sources."lru-cache-4.1.5"
+      sources."map-age-cleaner-0.1.3"
+      sources."mathjs-5.10.3"
+      sources."megaminx-0.9.0"
+      sources."mem-1.1.0"
+      sources."microbuffer-1.0.0"
+      sources."mime-db-1.40.0"
+      sources."mime-types-2.1.24"
+      sources."mimic-fn-1.2.0"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."mkdirp-0.5.1"
+      sources."nan-2.14.0"
+      sources."nice-try-1.0.5"
+      sources."no-case-2.3.2"
+      (sources."node-gyp-3.8.0" // {
+        dependencies = [
+          sources."semver-5.3.0"
+        ];
+      })
+      sources."node-version-1.2.0"
+      sources."nopt-3.0.6"
+      sources."normalize-package-data-2.5.0"
+      sources."npm-run-path-2.0.2"
+      sources."npmlog-4.1.2"
+      sources."number-is-nan-1.0.1"
+      sources."oauth-sign-0.9.0"
+      sources."object-assign-4.1.1"
+      sources."once-1.4.0"
+      sources."onetime-2.0.1"
+      sources."optionator-0.8.2"
+      (sources."ora-2.1.0" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."strip-ansi-4.0.0"
+        ];
+      })
+      sources."os-homedir-1.0.2"
+      sources."os-locale-2.1.0"
+      sources."os-tmpdir-1.0.2"
+      sources."osenv-0.1.5"
+      (sources."otfcc-ttcize-0.8.0" // {
+        dependencies = [
+          sources."fs-extra-4.0.3"
+          sources."jsonfile-4.0.0"
+          (sources."megaminx-0.3.3" // {
+            dependencies = [
+              sources."fs-extra-3.0.1"
+              sources."jsonfile-3.0.1"
+            ];
+          })
+          sources."yargs-8.0.2"
+        ];
+      })
+      sources."p-defer-1.0.0"
+      sources."p-finally-1.0.0"
+      sources."p-is-promise-2.1.0"
+      sources."p-limit-1.3.0"
+      sources."p-locate-2.0.0"
+      sources."p-try-1.0.0"
+      sources."pad-1.2.1"
+      sources."pako-1.0.10"
+      sources."param-case-2.1.1"
+      sources."parse-json-2.2.0"
+      sources."pascal-case-2.0.1"
+      (sources."patel-0.33.1" // {
+        dependencies = [
+          sources."camelcase-3.0.0"
+          sources."find-up-1.1.2"
+          sources."load-json-file-1.1.0"
+          sources."os-locale-1.4.0"
+          sources."path-exists-2.1.0"
+          sources."path-type-1.1.0"
+          sources."read-pkg-1.1.0"
+          sources."read-pkg-up-1.0.1"
+          sources."string-width-1.0.2"
+          sources."strip-bom-2.0.0"
+          sources."which-module-1.0.0"
+          sources."yargs-6.6.0"
+          sources."yargs-parser-4.2.1"
+        ];
+      })
+      sources."path-case-2.1.1"
+      sources."path-exists-3.0.0"
+      sources."path-is-absolute-1.0.1"
+      sources."path-key-2.0.1"
+      sources."path-parse-1.0.6"
+      sources."path-type-2.0.0"
+      sources."patrisika-0.21.0"
+      sources."patrisika-scopes-0.11.1"
+      sources."performance-now-2.1.0"
+      sources."pify-2.3.0"
+      sources."pinkie-2.0.4"
+      sources."pinkie-promise-2.0.1"
+      sources."prelude-ls-1.1.2"
+      sources."primitive-quadify-off-curves-0.4.1"
+      sources."process-nextick-args-2.0.0"
+      sources."promise-polyfill-6.1.0"
+      sources."proper-lockfile-3.2.0"
+      sources."pseudomap-1.0.2"
+      sources."psl-1.1.32"
+      sources."pump-3.0.0"
+      sources."punycode-2.1.1"
+      sources."qs-6.5.2"
+      sources."read-pkg-2.0.0"
+      sources."read-pkg-up-2.0.0"
+      sources."readable-stream-2.3.6"
+      sources."request-2.88.0"
+      sources."require-directory-2.1.1"
+      sources."require-main-filename-1.0.1"
+      sources."resolve-1.11.1"
+      sources."restore-cursor-2.0.0"
+      sources."resumer-0.0.0"
+      sources."retry-0.12.0"
+      sources."rimraf-2.2.8"
+      sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
+      sources."seed-random-2.2.0"
+      sources."semaphore-async-await-1.5.1"
+      sources."semver-5.7.0"
+      sources."sentence-case-2.1.1"
+      sources."set-blocking-2.0.0"
+      sources."shebang-command-1.2.0"
+      sources."shebang-regex-1.0.0"
+      sources."signal-exit-3.0.2"
+      sources."snake-case-2.1.0"
+      sources."source-map-0.6.1"
+      sources."spdx-correct-3.1.0"
+      sources."spdx-exceptions-2.2.0"
+      sources."spdx-expression-parse-3.0.0"
+      sources."spdx-license-ids-3.0.4"
+      sources."split-1.0.1"
+      sources."sprintf-js-1.0.3"
+      sources."sshpk-1.16.1"
+      sources."stack-trace-0.0.9"
+      (sources."string-width-2.1.1" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."is-fullwidth-code-point-2.0.0"
+          sources."strip-ansi-4.0.0"
+        ];
+      })
+      sources."string_decoder-1.1.1"
+      sources."strip-ansi-3.0.1"
+      sources."strip-bom-3.0.0"
+      sources."strip-bom-buf-1.0.0"
+      sources."strip-bom-stream-3.0.0"
+      sources."strip-eof-1.0.0"
+      sources."supports-color-5.5.0"
+      sources."swap-case-1.1.2"
+      sources."tar-2.2.2"
+      sources."temp-0.8.3"
+      sources."through-2.3.8"
+      sources."tiny-emitter-2.1.0"
+      sources."title-case-2.1.1"
+      sources."toml-2.3.6"
+      sources."topsort-0.0.2"
+      (sources."tough-cookie-2.4.3" // {
+        dependencies = [
+          sources."punycode-1.4.1"
+        ];
+      })
+      sources."ts-process-promises-1.0.2"
+      sources."tslib-1.9.3"
+      sources."ttf2woff-2.0.1"
+      sources."ttf2woff2-2.0.3"
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
+      sources."type-check-0.3.2"
+      sources."typed-function-1.1.0"
+      sources."typo-geom-0.5.1"
+      sources."universalify-0.1.2"
+      sources."unorm-1.5.0"
+      sources."upper-case-1.1.3"
+      sources."upper-case-first-1.1.2"
+      sources."uri-js-4.2.2"
+      sources."util-deprecate-1.0.2"
+      sources."uuid-3.3.2"
+      sources."validate-npm-package-license-3.0.4"
+      (sources."verda-0.2.0" // {
+        dependencies = [
+          sources."fs-extra-6.0.1"
+          sources."jsonfile-4.0.0"
+        ];
+      })
+      sources."verror-1.10.0"
+      sources."wcwidth-1.0.1"
+      sources."which-1.3.1"
+      sources."which-module-2.0.0"
+      sources."wide-align-1.1.3"
+      sources."wordwrap-1.0.0"
+      (sources."wrap-ansi-2.1.0" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+        ];
+      })
+      sources."wrappy-1.0.2"
+      sources."y18n-3.2.1"
+      sources."yallist-2.1.2"
+      (sources."yargs-12.0.5" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."camelcase-5.3.1"
+          sources."cliui-4.1.0"
+          sources."cross-spawn-6.0.5"
+          sources."execa-1.0.0"
+          sources."find-up-3.0.0"
+          sources."get-stream-4.1.0"
+          sources."invert-kv-2.0.0"
+          sources."lcid-2.0.0"
+          sources."locate-path-3.0.0"
+          sources."mem-4.3.0"
+          sources."mimic-fn-2.1.0"
+          sources."os-locale-3.1.0"
+          sources."p-limit-2.2.0"
+          sources."p-locate-3.0.0"
+          sources."p-try-2.2.0"
+          sources."strip-ansi-4.0.0"
+          sources."yargs-parser-11.1.1"
+        ];
+      })
+      sources."yargs-parser-7.0.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/servers/web-apps/codimd/node.nix b/nixpkgs/pkgs/data/fonts/iosevka/node.nix
index 0983d3e127be..0983d3e127be 100644
--- a/pkgs/servers/web-apps/codimd/node.nix
+++ b/nixpkgs/pkgs/data/fonts/iosevka/node.nix
diff --git a/pkgs/data/fonts/ipaexfont/default.nix b/nixpkgs/pkgs/data/fonts/ipaexfont/default.nix
index 4d7e2fa380e0..4d7e2fa380e0 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 d1cb00708838..d1cb00708838 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 1501e0fb7fa2..1501e0fb7fa2 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 afa59b737a5c..afa59b737a5c 100644
--- a/pkgs/data/fonts/iwona/default.nix
+++ b/nixpkgs/pkgs/data/fonts/iwona/default.nix
diff --git a/pkgs/data/fonts/jost/default.nix b/nixpkgs/pkgs/data/fonts/jost/default.nix
index ecada2eda7b7..ecada2eda7b7 100644
--- a/pkgs/data/fonts/jost/default.nix
+++ b/nixpkgs/pkgs/data/fonts/jost/default.nix
diff --git a/pkgs/data/fonts/junicode/default.nix b/nixpkgs/pkgs/data/fonts/junicode/default.nix
index 1cfe1d5d4b00..1cfe1d5d4b00 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 1c1609b03f19..1c1609b03f19 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 c1de2806ef18..c1de2806ef18 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 1b63223f0bf6..1b63223f0bf6 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 6ed540121a2c..6ed540121a2c 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 2cd33e9fe1b3..2cd33e9fe1b3 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 ea9d1837ef5b..ea9d1837ef5b 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 5657b8380a96..5657b8380a96 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 efbe6a4c41cb..efbe6a4c41cb 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 4d41df4fdb85..4d41df4fdb85 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 1bc3b9b20927..1bc3b9b20927 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 4a14e095cf05..4a14e095cf05 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 2152b960cdc2..2152b960cdc2 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 62aad87c902b..62aad87c902b 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 f5e6083f9446..f5e6083f9446 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 e55d50307415..e55d50307415 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 ec932ab978c2..ec932ab978c2 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 97832ab56517..97832ab56517 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 8df851cb9dfb..8df851cb9dfb 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 1b277a0691ce..1b277a0691ce 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 679f52002139..679f52002139 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 d9e7ec66ee67..d9e7ec66ee67 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 0e8b1f8fe4db..0e8b1f8fe4db 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 fe733359f3a8..fe733359f3a8 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 9dce73a28aae..9dce73a28aae 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 60c77dddc8dd..60c77dddc8dd 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 1c36d0f57fe4..1c36d0f57fe4 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 0126fbac225e..0126fbac225e 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 024e6049a386..024e6049a386 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 f990575def0f..f990575def0f 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 228952aaa56d..228952aaa56d 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 193e98d01a4b..193e98d01a4b 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 2a700be113a4..2a700be113a4 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 2bc5a82fa94f..2bc5a82fa94f 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 658c3bdf20a7..658c3bdf20a7 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 de8ea80b0175..de8ea80b0175 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 4230e63360b5..4230e63360b5 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 03bc8a0db4da..03bc8a0db4da 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 bb5a1ed8a9f1..bb5a1ed8a9f1 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 f3be8857284c..f3be8857284c 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 b39a59d1ba7a..b39a59d1ba7a 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 b9d9025b2c08..b9d9025b2c08 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 f6b8210290e7..f6b8210290e7 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 bc8fc8041a81..bc8fc8041a81 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 c08630335d4a..c08630335d4a 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 c6bdbd40248a..c6bdbd40248a 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 0de5aa8fdf3e..0de5aa8fdf3e 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 5043e031c08f..8e3e1f820ce0 100644
--- a/pkgs/data/fonts/noto-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix
@@ -57,16 +57,20 @@ rec {
     weights = "{Black,Condensed,Extra,Medium,Semi,Thin}*";
     sha256 = "0l94aiy1b3qirg2mmbagbr0014vqk32za79pzck1acy2hgy716kq";
   };
-  noto-fonts-cjk = let version = "1.004"; in fetchzip {
+  noto-fonts-cjk = let version = "2.001"; in fetchFromGitHub rec {
     name = "noto-fonts-cjk-${version}";
 
     # Same as https://noto-website.storage.googleapis.com/pkgs/NotoSansCJK.ttc.zip but versioned & with no extra SIL license file
-    url = "https://raw.githubusercontent.com/googlei18n/noto-cjk/40d9f5b179a59a06b98373c76bdc3e2119e4e6b2/NotoSansCJK.ttc.zip";
+    owner = "googlei18n";
+    repo = "noto-cjk";
+    rev = "NotoSansV${version}";
+
     postFetch = ''
-      mkdir -p $out/share/fonts
-      unzip -j $downloadedFile \*.ttc -d $out/share/fonts/noto
+      mkdir -p $out/share/fonts/noto
+      tar xOf $downloadedFile noto-cjk-${rev}/NotoSansCJK.ttc.zip |
+          funzip > $out/share/fonts/noto/NotoSansCJK.ttc
     '';
-    sha256 = "0ghw2azqq3nkcxsbvf53qjmrhcfsnry79rq7jsr0wwi2pn7d3dsq";
+    sha256 = "1r2wlw4vmrf2vlwhgjfvndlq1bj4ys5jzspmv6cz5cg3hpqqf528";
 
     meta = with stdenv.lib; {
       inherit version;
diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/nixpkgs/pkgs/data/fonts/noto-fonts/tools.nix
index a9d45128c5b4..a9d45128c5b4 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 4354725c90ce..4354725c90ce 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 c2ea6a7180b3..c2ea6a7180b3 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 cd0d0063efb2..cd0d0063efb2 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 8519c3468913..8519c3468913 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 dfe1426d697a..dfe1426d697a 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 699345f753eb..699345f753eb 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 4730a67e290c..4730a67e290c 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 e34e49d98147..e34e49d98147 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 d02925e3a375..d02925e3a375 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 e6f0776daea0..e6f0776daea0 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 1e6610e8e44d..1e6610e8e44d 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 f4da6508f083..f4da6508f083 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 144ec3bab850..144ec3bab850 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 57395c507fe0..57395c507fe0 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 24155f2ea546..24155f2ea546 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 c8044905a088..c8044905a088 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 c28c9283a9bc..c28c9283a9bc 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 b2207e01df1a..b2207e01df1a 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 14c66fb39b22..14c66fb39b22 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 429cd80c2fc7..429cd80c2fc7 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 7e268182eef4..7e268182eef4 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 7fd6b80b714e..7fd6b80b714e 100644
--- a/pkgs/data/fonts/raleway/default.nix
+++ b/nixpkgs/pkgs/data/fonts/raleway/default.nix
diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/nixpkgs/pkgs/data/fonts/redhat-liberation-fonts/default.nix
index 61206ca5d14b..61206ca5d14b 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 c05b9c69aef5..c05b9c69aef5 100644
--- a/pkgs/data/fonts/redhat-official/default.nix
+++ b/nixpkgs/pkgs/data/fonts/redhat-official/default.nix
diff --git a/pkgs/data/fonts/ricty/default.nix b/nixpkgs/pkgs/data/fonts/ricty/default.nix
index 2667562b1b02..2667562b1b02 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 2bdb96228d9c..2bdb96228d9c 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 175acb22d7b2..175acb22d7b2 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 c5ce13ad7ae4..c5ce13ad7ae4 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 707d31ac531a..707d31ac531a 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 431987024926..431987024926 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 1b8d4e60653c..1b8d4e60653c 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 0b90a43ca3e2..0b90a43ca3e2 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 dd4a01c782ee..dd4a01c782ee 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 90b32f251ef6..90b32f251ef6 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 f46fda0dd310..f46fda0dd310 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 062b29c90397..062b29c90397 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 af3c5dd25ee0..af3c5dd25ee0 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 89bca56a53ef..89bca56a53ef 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 a00036510f50..a00036510f50 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 883e43b4381f..883e43b4381f 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 a0acf78d855d..a0acf78d855d 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 be4d045815c7..be4d045815c7 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 85f5cddd2eab..85f5cddd2eab 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 87e24c0e23c3..87e24c0e23c3 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 bb5a67c83068..bb5a67c83068 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 bea5fea0f9d3..bea5fea0f9d3 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 87484a99b110..87484a99b110 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 873528b8bde1..873528b8bde1 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 f5d15439079d..f5d15439079d 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 1d5ed37767c3..1d5ed37767c3 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 bfc66a77207f..bfc66a77207f 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 7778c4a98b81..7778c4a98b81 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 380024e7e1a3..380024e7e1a3 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 f06a5bfee27a..f06a5bfee27a 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 958af414ff09..958af414ff09 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 211cc73cc9de..211cc73cc9de 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 4198fe2cbe66..4198fe2cbe66 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 fbc29cdf5fb1..fbc29cdf5fb1 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 8e1d27431748..8e1d27431748 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 7e55a70c71a9..7e55a70c71a9 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 82563205454c..82563205454c 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 6cebe2120fec..6cebe2120fec 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 494f48fd36e0..494f48fd36e0 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 f485f43b60c6..f485f43b60c6 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 024e1acd4345..024e1acd4345 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 a9bf3720c071..a9bf3720c071 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/ubuntu-font-family/default.nix b/nixpkgs/pkgs/data/fonts/ubuntu-font-family/default.nix
index 5f072f90f055..5f072f90f055 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 996d11923972..996d11923972 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 35551e929e64..35551e929e64 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 c98936b8096d..c98936b8096d 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 cd719a62d99f..cd719a62d99f 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 d495efc79eca..d495efc79eca 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 ee2c2406bc6f..ee2c2406bc6f 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 6d169e940cf9..6d169e940cf9 100644
--- a/pkgs/data/fonts/unscii/default.nix
+++ b/nixpkgs/pkgs/data/fonts/unscii/default.nix
diff --git a/pkgs/data/fonts/vazir-fonts/default.nix b/nixpkgs/pkgs/data/fonts/vazir-fonts/default.nix
index d004e75571b7..d004e75571b7 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 01a4072099ad..01a4072099ad 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 a269f17bf0e6..a269f17bf0e6 100644
--- a/pkgs/data/fonts/vegur/default.nix
+++ b/nixpkgs/pkgs/data/fonts/vegur/default.nix
diff --git a/pkgs/data/fonts/vista-fonts-chs/default.nix b/nixpkgs/pkgs/data/fonts/vista-fonts-chs/default.nix
index 6a7cc71133ae..6a7cc71133ae 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 2d00b6244887..2d00b6244887 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 e8784d90e7fd..e8784d90e7fd 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 503e62cfa295..503e62cfa295 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 172273671207..172273671207 100644
--- a/pkgs/data/fonts/weather-icons/default.nix
+++ b/nixpkgs/pkgs/data/fonts/weather-icons/default.nix
diff --git a/pkgs/data/fonts/wqy-microhei/default.nix b/nixpkgs/pkgs/data/fonts/wqy-microhei/default.nix
index dc87e6b634f7..dc87e6b634f7 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 7df1e5aeb2a8..7df1e5aeb2a8 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 553c1dbde221..553c1dbde221 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 0e996da2fc7c..0e996da2fc7c 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 e713f4d64a37..e713f4d64a37 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 369fb53e6abc..369fb53e6abc 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 6529e5c571c2..6529e5c571c2 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 ce7bb11522ba..ce7bb11522ba 100644
--- a/pkgs/data/icons/bibata-cursors/default.nix
+++ b/nixpkgs/pkgs/data/icons/bibata-cursors/default.nix
diff --git a/pkgs/data/icons/capitaine-cursors/default.nix b/nixpkgs/pkgs/data/icons/capitaine-cursors/default.nix
index 46d6c1a731ec..46d6c1a731ec 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 d4a15a105cd3..d4a15a105cd3 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 c15e0f4e5510..c15e0f4e5510 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 a4ffefe1f26d..a4ffefe1f26d 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/hicolor-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/hicolor-icon-theme/default.nix
index 2c0872188e02..2c0872188e02 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 29306cb316af..29306cb316af 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 ee45a186f290..ee45a186f290 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 7b4ed7a66809..7b4ed7a66809 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 17892679a7ea..17892679a7ea 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 8e5a317082ea..8e5a317082ea 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 b545856f703f..b545856f703f 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 ddec15e5f318..ddec15e5f318 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 1a2eb6504d9d..1a2eb6504d9d 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 de808e44ea6c..de808e44ea6c 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 fb659e1c22e5..fb659e1c22e5 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/tango-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/tango-icon-theme/default.nix
index d38f6485f135..d38f6485f135 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 ee3d00ccf3ed..ee3d00ccf3ed 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 b6def37def6f..b6def37def6f 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 942f79ca6e45..942f79ca6e45 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 26b06b4e652e..26b06b4e652e 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 1c35d3deef91..1c35d3deef91 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 54b54d278ffb..54b54d278ffb 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 92930c67cc90..92930c67cc90 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 a99df2e7bd65..a99df2e7bd65 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 07d3629196a7..07d3629196a7 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 e969596752f3..e969596752f3 100644
--- a/pkgs/data/misc/cacert/setup-hook.sh
+++ b/nixpkgs/pkgs/data/misc/cacert/setup-hook.sh
diff --git a/pkgs/data/misc/combinatorial_designs/default.nix b/nixpkgs/pkgs/data/misc/combinatorial_designs/default.nix
index 18331b5ada9d..18331b5ada9d 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 fec422b33acf..fec422b33acf 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 3cadb477ae81..3cadb477ae81 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 ee08c07f5a66..ee08c07f5a66 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 e292b5a7bf0c..e292b5a7bf0c 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 edfc762ad602..edfc762ad602 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 9a3141aef197..9a3141aef197 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 528486328c68..528486328c68 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 e48470a67bb7..e48470a67bb7 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 683b2e8606b8..683b2e8606b8 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 309ae47a8516..309ae47a8516 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 aea5feef46c7..aea5feef46c7 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 0eb3dbefe41b..0eb3dbefe41b 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 163f230e077a..163f230e077a 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 343071fcf59c..343071fcf59c 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 d27e1d2dfd2e..d27e1d2dfd2e 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 6d00f34e9787..6d00f34e9787 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 65ad964736d1..65ad964736d1 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 4e1d1e02a2f4..4e1d1e02a2f4 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 a2df56c0898f..a2df56c0898f 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 71fe32c10665..71fe32c10665 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 8bc6c8adc13e..8bc6c8adc13e 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 1c14bcc9f981..1c14bcc9f981 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 3983869a4528..3983869a4528 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 19872bef7fe3..19872bef7fe3 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 222fd2f88707..222fd2f88707 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 967122c1bd4d..967122c1bd4d 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 85f2cff09db2..85f2cff09db2 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 d14ccdec2ead..d14ccdec2ead 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 b5414ab18b4d..b5414ab18b4d 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 c90b8aa7e37d..c90b8aa7e37d 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 72895653479b..72895653479b 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 6d29d8760734..6d29d8760734 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 043d3d65b84e..043d3d65b84e 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/tzdata/default.nix b/nixpkgs/pkgs/data/misc/tzdata/default.nix
index 0d19d8c9dcab..0d19d8c9dcab 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 9975d0aec31a..9975d0aec31a 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/wireless-regdb/default.nix b/nixpkgs/pkgs/data/misc/wireless-regdb/default.nix
index 43847b4b3b68..43847b4b3b68 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 e11362992608..e11362992608 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 4986101584e1..4986101584e1 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 9728b2f96c48..9728b2f96c48 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 78b99081504d..78b99081504d 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 3d8e16443dbf..3d8e16443dbf 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 896a8338f118..896a8338f118 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 35e69641f116..35e69641f116 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 f8c827e826d0..f8c827e826d0 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 2c253a1029d6..2c253a1029d6 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 d051d205808b..d051d205808b 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 156ee653bbe3..156ee653bbe3 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 41c4b73d3f62..41c4b73d3f62 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 54ef5225d2f1..54ef5225d2f1 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 72922eee96c4..72922eee96c4 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 5297d5dbd5dc..5297d5dbd5dc 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 7debe119aa1c..7debe119aa1c 100644
--- a/pkgs/data/soundfonts/fluid/default.nix
+++ b/nixpkgs/pkgs/data/soundfonts/fluid/default.nix
diff --git a/pkgs/data/themes/adementary/default.nix b/nixpkgs/pkgs/data/themes/adementary/default.nix
index 40190d65d5ed..40190d65d5ed 100644
--- a/pkgs/data/themes/adementary/default.nix
+++ b/nixpkgs/pkgs/data/themes/adementary/default.nix
diff --git a/pkgs/data/themes/ant-theme/default.nix b/nixpkgs/pkgs/data/themes/ant-theme/default.nix
index 8ff869bc7aaa..8ff869bc7aaa 100644
--- a/pkgs/data/themes/ant-theme/default.nix
+++ b/nixpkgs/pkgs/data/themes/ant-theme/default.nix
diff --git a/pkgs/data/themes/greybird/default.nix b/nixpkgs/pkgs/data/themes/greybird/default.nix
index 02c8d2b64901..02c8d2b64901 100644
--- a/pkgs/data/themes/greybird/default.nix
+++ b/nixpkgs/pkgs/data/themes/greybird/default.nix
diff --git a/pkgs/data/themes/matcha/default.nix b/nixpkgs/pkgs/data/themes/matcha/default.nix
index 5a43511d532c..5a43511d532c 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 46b44d3ff90c..46b44d3ff90c 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 1fc82e8aca2b..1fc82e8aca2b 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 c4265875390e..c4265875390e 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 1f0e110488b7..1f0e110488b7 100644
--- a/pkgs/data/themes/nordic/default.nix
+++ b/nixpkgs/pkgs/data/themes/nordic/default.nix
diff --git a/pkgs/data/themes/plano/default.nix b/nixpkgs/pkgs/data/themes/plano/default.nix
index d672855df09d..d672855df09d 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 df0201af3b86..df0201af3b86 100644
--- a/pkgs/data/themes/plata/default.nix
+++ b/nixpkgs/pkgs/data/themes/plata/default.nix
diff --git a/pkgs/data/themes/qogir/default.nix b/nixpkgs/pkgs/data/themes/qogir/default.nix
index aac9ec5e85e1..aac9ec5e85e1 100644
--- a/pkgs/data/themes/qogir/default.nix
+++ b/nixpkgs/pkgs/data/themes/qogir/default.nix
diff --git a/pkgs/data/themes/shades-of-gray/default.nix b/nixpkgs/pkgs/data/themes/shades-of-gray/default.nix
index fb94fa00b75f..fb94fa00b75f 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 b845522a28a1..b845522a28a1 100644
--- a/pkgs/data/themes/sierra/default.nix
+++ b/nixpkgs/pkgs/data/themes/sierra/default.nix
diff --git a/pkgs/data/themes/stilo/default.nix b/nixpkgs/pkgs/data/themes/stilo/default.nix
index 48f29ad31113..48f29ad31113 100644
--- a/pkgs/data/themes/stilo/default.nix
+++ b/nixpkgs/pkgs/data/themes/stilo/default.nix
diff --git a/pkgs/data/themes/zuki/default.nix b/nixpkgs/pkgs/data/themes/zuki/default.nix
index f55ed31c1cef..f55ed31c1cef 100644
--- a/pkgs/data/themes/zuki/default.nix
+++ b/nixpkgs/pkgs/data/themes/zuki/default.nix
diff --git a/pkgs/desktops/deepin/dbus-factory/default.nix b/nixpkgs/pkgs/desktops/deepin/dbus-factory/default.nix
index ee0c81d7d39e..ee0c81d7d39e 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 608096951b60..608096951b60 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 a3b5e20effc7..a3b5e20effc7 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 16c8002b8e48..16c8002b8e48 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 906812cf98b4..906812cf98b4 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 2c6e204d3437..2c6e204d3437 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 4fb0272a3cef..4fb0272a3cef 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 c9a15ad88d4a..c9a15ad88d4a 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 87b76045b43d..87b76045b43d 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 e143f783a5a4..e143f783a5a4 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 8f6d8a67b1a9..8f6d8a67b1a9 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 253a67b04ec7..253a67b04ec7 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 3ced15e7e5a4..3ced15e7e5a4 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 582760e6db2a..582760e6db2a 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 c203ccae6fba..c203ccae6fba 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-launcher/default.nix b/nixpkgs/pkgs/desktops/deepin/dde-launcher/default.nix
index 2710393a257c..2710393a257c 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 84c7c9207eca..84c7c9207eca 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 9f7ecd423c56..9f7ecd423c56 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 a6941e975eb4..a6941e975eb4 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 8e58ae2f684c..8e58ae2f684c 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 0d063cbd8485..0d063cbd8485 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 0c00627cd4fb..0c00627cd4fb 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 a8cce9ba3923..a8cce9ba3923 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 5b7ca7566075..5b7ca7566075 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 f43909f37dc1..f43909f37dc1 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 5849bc78ac0b..5849bc78ac0b 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-gettext-tools/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-gettext-tools/default.nix
index d9a6f3701688..d9a6f3701688 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 469a43efe329..469a43efe329 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 c5cf9e9ad3a8..c5cf9e9ad3a8 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 5957478aa480..5957478aa480 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 43a124c07196..43a124c07196 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-metacity/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-metacity/default.nix
index fdf2c240e2c8..fdf2c240e2c8 100644
--- a/pkgs/desktops/deepin/deepin-metacity/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/deepin-metacity/default.nix
diff --git a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-movie-reborn/default.nix
index cdf3019e5fe1..cdf3019e5fe1 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-mutter/deepin-mutter.plugins-dir.patch b/nixpkgs/pkgs/desktops/deepin/deepin-mutter/deepin-mutter.plugins-dir.patch
index 4a57b501e01e..4a57b501e01e 100644
--- a/pkgs/desktops/deepin/deepin-mutter/deepin-mutter.plugins-dir.patch
+++ b/nixpkgs/pkgs/desktops/deepin/deepin-mutter/deepin-mutter.plugins-dir.patch
diff --git a/pkgs/desktops/deepin/deepin-mutter/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-mutter/default.nix
index 83afe1ee24f7..83afe1ee24f7 100644
--- a/pkgs/desktops/deepin/deepin-mutter/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/deepin-mutter/default.nix
diff --git a/pkgs/desktops/deepin/deepin-screenshot/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-screenshot/default.nix
index 4096df661909..4096df661909 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 737c99261f9d..737c99261f9d 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 bb752cc1ca90..bb752cc1ca90 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 937c1f0d2184..937c1f0d2184 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 d5702a55d903..d5702a55d903 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 f99974ba9c26..f99974ba9c26 100644
--- a/pkgs/desktops/deepin/deepin-wallpapers/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/deepin-wallpapers/default.nix
diff --git a/pkgs/desktops/deepin/deepin-wm/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-wm/default.nix
index 986bee2f0dd2..986bee2f0dd2 100644
--- a/pkgs/desktops/deepin/deepin-wm/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/deepin-wm/default.nix
diff --git a/pkgs/desktops/deepin/default.nix b/nixpkgs/pkgs/desktops/deepin/default.nix
index 5d68396a4980..5d68396a4980 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/default.nix
diff --git a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix b/nixpkgs/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix
index 4baa2262cd6e..4baa2262cd6e 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 a0ed5c04e185..a0ed5c04e185 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 4992519f8326..4992519f8326 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 c0834ace8f8c..c0834ace8f8c 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 044d5e2a2eaf..044d5e2a2eaf 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 92cf3960c736..92cf3960c736 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 4b79969970a8..4b79969970a8 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 a6282b979f76..a6282b979f76 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 8e75917907ac..8e75917907ac 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 2e6ddfcdb2dd..2e6ddfcdb2dd 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 7df1fdf3165a..7df1fdf3165a 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 ce1d7330a222..ce1d7330a222 100755
--- a/pkgs/desktops/deepin/setup-hook.sh
+++ b/nixpkgs/pkgs/desktops/deepin/setup-hook.sh
diff --git a/pkgs/desktops/deepin/udisks2-qt5/default.nix b/nixpkgs/pkgs/desktops/deepin/udisks2-qt5/default.nix
index b0f5aaee97c0..b0f5aaee97c0 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 089d9289827e..089d9289827e 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 a8b5e08abd65..a8b5e08abd65 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 8e73682065d3..8e73682065d3 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 96c42b3ff3ca..96c42b3ff3ca 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 a7f5eaf63392..a7f5eaf63392 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 07aac3d611b7..07aac3d611b7 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 f53f6ffa7ca8..f53f6ffa7ca8 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 409b3f7bb8dd..409b3f7bb8dd 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 a1de3f951312..a1de3f951312 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 92d36c0e772f..92d36c0e772f 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 31dd985af2a7..31dd985af2a7 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 37bd631adbcb..37bd631adbcb 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 177a9f47c31e..177a9f47c31e 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 95e6d0f12b03..95e6d0f12b03 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 0f2a98c61f61..0f2a98c61f61 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 03440c02c14f..03440c02c14f 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 ac9a87299ab8..ac9a87299ab8 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 e246a8cc9389..e246a8cc9389 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 7c713cb91221..7c713cb91221 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 65c3ddf1fcf8..65c3ddf1fcf8 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 9e3e83b1262a..9e3e83b1262a 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 c774468852ee..c774468852ee 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 df3de11e738d..df3de11e738d 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 ef18f0783ce3..ef18f0783ce3 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 54a2bd526a94..54a2bd526a94 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 c3aee9024a20..c3aee9024a20 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 c15f43b542aa..c15f43b542aa 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 369880c4fc1a..369880c4fc1a 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 1d9a179d236b..1d9a179d236b 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 3ea04048accc..3ea04048accc 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 5ff687adcf6f..5ff687adcf6f 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 1fc780026064..1fc780026064 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 7b1ccb97dc4b..7b1ccb97dc4b 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 bf0cec8dfbe6..bf0cec8dfbe6 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 0be9d7acb9ce..0be9d7acb9ce 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 c61ecc16f154..c61ecc16f154 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 42f47bc5a83f..42f47bc5a83f 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 ceabfbdd158e..ceabfbdd158e 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 72928d820379..72928d820379 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 d2539889fdba..d2539889fdba 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 68f379c25109..68f379c25109 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 ee0282147de7..ee0282147de7 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 3f73af861c04..3f73af861c04 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 468f8e287a7c..468f8e287a7c 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 453a4459fddb..453a4459fddb 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 215c9eb3e5e7..215c9eb3e5e7 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 838e51337453..838e51337453 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 cf34c7e7c686..cf34c7e7c686 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 9a70319952cf..9a70319952cf 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 4e5595385b48..4e5595385b48 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 b82c1b2dfe58..b82c1b2dfe58 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 733b8ecca920..733b8ecca920 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 2dcd265e2e48..2dcd265e2e48 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 388808b7d646..388808b7d646 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 e0078d5ae410..e0078d5ae410 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 6edf86ec552b..6edf86ec552b 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 3b68bec7585e..3b68bec7585e 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 03619f38c9ba..03619f38c9ba 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 c95d135e9e73..c95d135e9e73 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 f29f324f2ee8..f29f324f2ee8 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 e0f28bc3446d..e0f28bc3446d 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 37f2a859488c..37f2a859488c 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 d46882deb41e..d46882deb41e 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 25faf2676b82..25faf2676b82 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 1f1bfafb5950..1f1bfafb5950 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 37401af3ce60..37401af3ce60 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 3a28b8635a11..3a28b8635a11 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-photos/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
index 9d08cc24aadb..9d08cc24aadb 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-photos/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 fd47f54eb899..fd47f54eb899 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 fbf80fc32e84..fbf80fc32e84 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 dbbbb43659ba..dbbbb43659ba 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 d21cfcfd72d2..d21cfcfd72d2 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/nautilus-sendto/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix
index 7ac8b4dfe116..7ac8b4dfe116 100644
--- a/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/polari/default.nix
index 73b8016d97b4..73b8016d97b4 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 a1bcb406eb3a..a1bcb406eb3a 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 ae360d73b879..ae360d73b879 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 0f88372d9cfb..0f88372d9cfb 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 4734a0e96b8c..4734a0e96b8c 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 bad06bae4054..bad06bae4054 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 8a6ecc5d5e19..8a6ecc5d5e19 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/dconf/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/dconf/default.nix
index 43f8dd08dbff..43f8dd08dbff 100644
--- a/pkgs/desktops/gnome-3/core/dconf/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/dconf/default.nix
diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/empathy/default.nix
index 5a08454cb35e..5a08454cb35e 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 5c896ec01fc0..5c896ec01fc0 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 f4e87b50906b..f4e87b50906b 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 68beb0e47e35..68beb0e47e35 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 8075d5d48059..8075d5d48059 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 334235516591..334235516591 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 8b64b3df8015..8b64b3df8015 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 420a0d3e6b11..420a0d3e6b11 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 6b5bd6152bd6..6b5bd6152bd6 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 401b6aea0c28..401b6aea0c28 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 66071aa4af80..66071aa4af80 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 58481f0730fa..58481f0730fa 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/reset-environment.patch b/nixpkgs/pkgs/desktops/gnome-3/core/gdm/reset-environment.patch
index 61defd9c4bc2..61defd9c4bc2 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/gjs/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gjs/default.nix
index ef4de3699151..ef4de3699151 100644
--- a/pkgs/desktops/gnome-3/core/gjs/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gjs/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
index 1e332502db5d..1e332502db5d 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 817c8324c6b2..817c8324c6b2 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 9214aa0a9a79..9214aa0a9a79 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 b79651ea4bc7..b79651ea4bc7 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 d0ab339a504d..d0ab339a504d 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 57cb90c7c458..57cb90c7c458 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 c7a9b4ccfbd1..c7a9b4ccfbd1 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 97d8f0bee683..97d8f0bee683 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 57eb4b3d44a9..57eb4b3d44a9 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 4beeb190f025..4beeb190f025 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 613de6c3c164..613de6c3c164 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 8e09b152e83a..8e09b152e83a 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 317c7e915841..317c7e915841 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-keyring/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
index f36d3f4a6e0a..f36d3f4a6e0a 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-accounts/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
index 9ae4a572d93b..9ae4a572d93b 100644
--- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-online-accounts/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 ed4c1a3da13a..ed4c1a3da13a 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 4a22fc535197..4a22fc535197 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 1d14481e7783..1d14481e7783 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 38adf7137f76..38adf7137f76 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 fe4feaf70857..fe4feaf70857 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 6929f821e379..6929f821e379 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 272656fae78c..272656fae78c 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 8f3951af2da8..8f3951af2da8 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 21281f15a5c1..21281f15a5c1 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 555664e8ae25..555664e8ae25 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 d9001d9b1b94..d9001d9b1b94 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 3207af110885..3207af110885 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 4a5366a72e70..4a5366a72e70 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 6f443a8a43ed..6f443a8a43ed 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 83159c2ad72f..83159c2ad72f 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 77a630261fb5..77a630261fb5 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 3d5cfb85d671..3d5cfb85d671 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-docs/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
index d9f938621433..d9f938621433 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-user-docs/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 65f9fb0db806..65f9fb0db806 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/grilo-plugins/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
index 2e8c3c4a0030..2e8c3c4a0030 100644
--- a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
diff --git a/pkgs/desktops/gnome-3/core/grilo/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/grilo/default.nix
index a2bee6ac41ee..a2bee6ac41ee 100644
--- a/pkgs/desktops/gnome-3/core/grilo/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/grilo/default.nix
diff --git a/pkgs/desktops/gnome-3/core/grilo/setup-hook.sh b/nixpkgs/pkgs/desktops/gnome-3/core/grilo/setup-hook.sh
index 9337c520a207..9337c520a207 100644
--- a/pkgs/desktops/gnome-3/core/grilo/setup-hook.sh
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/grilo/setup-hook.sh
diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gucharmap/default.nix
index 6c291c1874f8..6c291c1874f8 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/gucharmap/unicode-data.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix
index cfdda920e27c..cfdda920e27c 100644
--- a/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.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 bc0f5683a75f..bc0f5683a75f 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/3.28.nix b/nixpkgs/pkgs/desktops/gnome-3/core/mutter/3.28.nix
index 4f436b54ce48..4f436b54ce48 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 61219ca4488e..61219ca4488e 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/fix-paths-328.patch b/nixpkgs/pkgs/desktops/gnome-3/core/mutter/fix-paths-328.patch
index 6c40624a55da..6c40624a55da 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 6ac0a431f61f..6ac0a431f61f 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/nautilus/bubblewrap-paths.patch b/nixpkgs/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch
index 37358c8432c5..37358c8432c5 100644
--- a/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch
diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/nautilus/default.nix
index 2eeb77db0c65..2eeb77db0c65 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 e1313999675d..e1313999675d 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 4259f93eb24c..4259f93eb24c 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 c38e677a4217..c38e677a4217 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 047e79e14e5c..047e79e14e5c 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 c0d5d2be26d4..c0d5d2be26d4 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 d3319c4522e4..d3319c4522e4 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/tracker-miners/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
index eaa3ab3c089b..eaa3ab3c089b 100644
--- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch b/nixpkgs/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch
index 724c51cb56f8..724c51cb56f8 100644
--- a/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch
diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/tracker/default.nix
index 397184f798a8..397184f798a8 100644
--- a/pkgs/desktops/gnome-3/core/tracker/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/tracker/default.nix
diff --git a/pkgs/desktops/gnome-3/core/tracker/fix-paths.patch b/nixpkgs/pkgs/desktops/gnome-3/core/tracker/fix-paths.patch
index f5c13c3fcdaf..f5c13c3fcdaf 100644
--- a/pkgs/desktops/gnome-3/core/tracker/fix-paths.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/tracker/fix-paths.patch
diff --git a/pkgs/desktops/gnome-3/core/vino/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/vino/default.nix
index b3f06c2dcc1c..b3f06c2dcc1c 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-tools/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/yelp-tools/default.nix
index aac216262584..aac216262584 100644
--- a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/yelp-tools/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 f1a393117280..f1a393117280 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 24a49413960c..24a49413960c 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 89d0fd7a3b90..89d0fd7a3b90 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 742babf721ac..742babf721ac 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 d1e5179063f3..d1e5179063f3 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 80a3770b7030..80a3770b7030 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 647e7163d0b9..647e7163d0b9 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/devtools/nemiver/bool_slot.patch b/nixpkgs/pkgs/desktops/gnome-3/devtools/nemiver/bool_slot.patch
index 83423122110c..83423122110c 100644
--- a/pkgs/desktops/gnome-3/devtools/nemiver/bool_slot.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/devtools/nemiver/bool_slot.patch
diff --git a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix b/nixpkgs/pkgs/desktops/gnome-3/devtools/nemiver/default.nix
index 9fbce7c6cc02..9fbce7c6cc02 100644
--- a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/devtools/nemiver/default.nix
diff --git a/pkgs/desktops/gnome-3/devtools/nemiver/safe_ptr.patch b/nixpkgs/pkgs/desktops/gnome-3/devtools/nemiver/safe_ptr.patch
index e3413b224977..e3413b224977 100644
--- a/pkgs/desktops/gnome-3/devtools/nemiver/safe_ptr.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/devtools/nemiver/safe_ptr.patch
diff --git a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
index 568a6cace720..568a6cace720 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/battery-status/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/battery-status/default.nix
index afedd5f98e1a..afedd5f98e1a 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 e627bec8b931..e627bec8b931 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 755c8e1b02fb..755c8e1b02fb 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 e41227e85139..e41227e85139 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 06e7d27c5444..06e7d27c5444 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 0d48b8359c91..0d48b8359c91 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/gsconnect/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
index dd2a02b6be85..dd2a02b6be85 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 b32d0af32721..b32d0af32721 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 d08e6f3a57df..d08e6f3a57df 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 24b4c1cf703f..24b4c1cf703f 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/mediaplayer/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix
index 686d7be91a47..686d7be91a47 100644
--- a/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/mediaplayer/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 8c075a11bdcd..8c075a11bdcd 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 9a53d63860da..9a53d63860da 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/nohotcorner/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix
index 21ff70140be1..21ff70140be1 100644
--- a/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/nohotcorner/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 5faa55652d8a..5faa55652d8a 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 33c127f449b8..33c127f449b8 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 7046e6737269..7046e6737269 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 82e3d7c541ba..82e3d7c541ba 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 c72d72cce126..c72d72cce126 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 2ea54f4b0897..2ea54f4b0897 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 293918bd2b11..293918bd2b11 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 604b7433ccb4..604b7433ccb4 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 9a151a6ac8f7..9a151a6ac8f7 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 19ced0b5252c..19ced0b5252c 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 7d5de1062b16..7d5de1062b16 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-grid.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/workspace-grid.nix
index 10aee5cafe6e..10aee5cafe6e 100644
--- a/pkgs/desktops/gnome-3/extensions/workspace-grid.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/workspace-grid.nix
diff --git a/pkgs/desktops/gnome-3/find-latest-version.py b/nixpkgs/pkgs/desktops/gnome-3/find-latest-version.py
index b0359f799699..b0359f799699 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 3e274c35cdd9..3e274c35cdd9 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 00b3a04a1683..00b3a04a1683 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 21f089b324ef..21f089b324ef 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 94428d6640d0..94428d6640d0 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 c6c24be4be8c..c6c24be4be8c 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 c913a9e87294..c913a9e87294 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 ee55b5a65a5d..ee55b5a65a5d 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 b2c8e99e8239..b2c8e99e8239 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 cbac95c8f41e..cbac95c8f41e 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 2b40548d37ce..2b40548d37ce 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 5c3fafd3d02a..5c3fafd3d02a 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 06914d9817c7..06914d9817c7 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 ab0f0f0faf2d..ab0f0f0faf2d 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 72cce760b03e..72cce760b03e 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 540e379210ee..540e379210ee 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 18c6f43b3b36..18c6f43b3b36 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 712f984cbf9a..712f984cbf9a 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 a944e0c568a2..a944e0c568a2 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 5ec29554b363..5ec29554b363 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 4999e1f3343c..4999e1f3343c 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 54d45eedc3d9..54d45eedc3d9 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 94703f375b21..94703f375b21 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 7bb162b7b8b4..7bb162b7b8b4 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 c80c8b977cf5..c80c8b977cf5 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 3cade7ccdf8b..3cade7ccdf8b 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 d819961d2819..d819961d2819 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 3031b2c1d78f..3031b2c1d78f 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 b1e9cde906cf..b1e9cde906cf 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 81e037ee690d..81e037ee690d 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 fd7f7ef609df..fd7f7ef609df 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/gnome-video-effects/default.nix b/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix
index b65e9c1021e7..b65e9c1021e7 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix
diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/default.nix
index a35067587e04..a35067587e04 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 c8a3fad2272b..c8a3fad2272b 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 543453a2bd31..543453a2bd31 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 3776a9adbf2c..3776a9adbf2c 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 8b1d2b05df11..8b1d2b05df11 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 ff3a244e67d9..ff3a244e67d9 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 4aec5ba4d848..4aec5ba4d848 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/pidgin/default.nix b/nixpkgs/pkgs/desktops/gnome-3/misc/pidgin/default.nix
index c11fdfa6099e..c11fdfa6099e 100644
--- a/pkgs/desktops/gnome-3/misc/pidgin/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/misc/pidgin/default.nix
diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/nixpkgs/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
index fcbceab24eab..fcbceab24eab 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 f42b67239505..f42b67239505 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 54ea8dcf4875..54ea8dcf4875 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 e96dbf0b6fc5..e96dbf0b6fc5 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 fa28412dbf62..fa28412dbf62 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 4f7c13e8e4ae..4f7c13e8e4ae 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 c977c61dd099..c977c61dd099 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 72d109b69796..72d109b69796 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 4b412db409ae..4b412db409ae 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 d5018a4350f8..d5018a4350f8 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 b058bd87989d..b058bd87989d 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 f4e0e3b81629..f4e0e3b81629 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 1655a75eeba3..1655a75eeba3 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 6ef87cece4e4..6ef87cece4e4 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 b5eb093ad964..b5eb093ad964 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 7bb287c3fa59..7bb287c3fa59 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 531389011164..531389011164 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 1bc2e130d88d..1bc2e130d88d 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 abfdac1e7afb..abfdac1e7afb 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 096520f08f36..096520f08f36 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 10e75eea38f0..10e75eea38f0 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 70e0f2e3511c..70e0f2e3511c 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 62d59d18cc55..62d59d18cc55 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 6ddd9c76591b..6ddd9c76591b 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 f5ef6cba41f6..f5ef6cba41f6 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 c758fc38a1b9..c758fc38a1b9 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 c06a99eb36c2..c06a99eb36c2 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 a63882aa2a7a..a63882aa2a7a 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 6e8644b19b0c..6e8644b19b0c 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 af9570a2c733..af9570a2c733 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 0866fd104d23..0866fd104d23 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 ca601531b68f..ca601531b68f 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 f5331751c709..f5331751c709 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 6b03c2a6c9e8..6b03c2a6c9e8 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 3ce1ea068a71..3ce1ea068a71 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 193358605995..193358605995 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 d351f3e0d6e1..d351f3e0d6e1 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 74fa1b03fa6b..74fa1b03fa6b 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 affa0cc8c9d6..affa0cc8c9d6 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 7778eb92263c..7778eb92263c 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 5ea6b0d08824..5ea6b0d08824 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 75ec5aa06edc..75ec5aa06edc 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/default.nix b/nixpkgs/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
index f55fa579ff45..f55fa579ff45 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-config/default.nix b/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix
index e7ba00bc8a89..e7ba00bc8a89 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 0502426e82df..0502426e82df 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 7eed84b33908..7eed84b33908 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 7ba2f00b5c58..7ba2f00b5c58 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 4363c9f83920..4363c9f83920 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 792a323e6820..792a323e6820 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 6bdf5ce2c0c6..6bdf5ce2c0c6 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 82f393cf8d52..82f393cf8d52 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 54236bfbb7ef..54236bfbb7ef 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 40ef5697a547..40ef5697a547 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 6deef1bf56ba..6deef1bf56ba 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 02591b9eb86e..02591b9eb86e 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 2360d1970c99..2360d1970c99 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 00359e2ffede..00359e2ffede 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 320d451f087e..320d451f087e 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 f5bdcf064fd8..f5bdcf064fd8 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 c17ef21c6768..c17ef21c6768 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 748d33aa2ce0..748d33aa2ce0 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 e47d8e050828..e47d8e050828 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 14fa977e023d..14fa977e023d 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 47d3dfb3d5fe..47d3dfb3d5fe 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 5ef080ef50be..5ef080ef50be 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 f5b71eba141a..f5b71eba141a 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 de591f493f6f..de591f493f6f 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 108e8fe1e0b1..108e8fe1e0b1 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 35e3cd198f6b..35e3cd198f6b 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 7490a368efd9..7490a368efd9 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 667a73eb6307..667a73eb6307 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 3970b2b2921c..3970b2b2921c 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 8fad6cac8799..8fad6cac8799 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 72e509d59afd..72e509d59afd 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 bd6488d2c2ce..bd6488d2c2ce 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 bf2a91971dd9..bf2a91971dd9 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 664b85fc287b..664b85fc287b 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 4f77b3035015..4f77b3035015 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 7fbd192ac2ca..7fbd192ac2ca 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 f5c151d01f7f..f5c151d01f7f 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 85631f03e1d4..85631f03e1d4 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 3b154fd9812a..3b154fd9812a 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/default.nix b/nixpkgs/pkgs/desktops/mate/mate-control-center/default.nix
index 6e54b137ba1d..6e54b137ba1d 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 4a3036ae16e2..4a3036ae16e2 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 0bfcab586635..0bfcab586635 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 ba0cbd526f96..ba0cbd526f96 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 8f0f15fac2dd..8f0f15fac2dd 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 623e7f240964..623e7f240964 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 7185181d7476..7185181d7476 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 bb09b0a4849d..bb09b0a4849d 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 049e0a4bb69a..049e0a4bb69a 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 45d483503aa7..45d483503aa7 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 bbb49c203472..bbb49c203472 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 f5b6d62dd590..f5b6d62dd590 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 7f4d1c850151..7f4d1c850151 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 53a89bec4c1e..53a89bec4c1e 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 c5ad4628c54f..c5ad4628c54f 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 3448e8327f5b..3448e8327f5b 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 00d967a2d5cf..00d967a2d5cf 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 f7cdf036cebf..f7cdf036cebf 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 2339ad8fb1b3..2339ad8fb1b3 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 3c7b16a68312..3c7b16a68312 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 4d624479bbf6..4d624479bbf6 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 52d53478da1c..52d53478da1c 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 606a473cfaac..606a473cfaac 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 36f8fecb1925..36f8fecb1925 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 171d8971c4e8..171d8971c4e8 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 c3b39e85925d..c3b39e85925d 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 fe294ae4985a..fe294ae4985a 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 5edebb39be41..5edebb39be41 100644
--- a/pkgs/desktops/maxx/default.nix
+++ b/nixpkgs/pkgs/desktops/maxx/default.nix
diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
index 4a4850a0824e..4a4850a0824e 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 9f684c22767d..9f684c22767d 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 90f326fb8269..90f326fb8269 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 a869ff24e920..a869ff24e920 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-files/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix
index 99c7afffe7a5..99c7afffe7a5 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 3191f4e3cb2b..3191f4e3cb2b 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 cba593e4c960..cba593e4c960 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 1704db78c5e9..1704db78c5e9 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 74af15e27879..74af15e27879 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 2c146169f427..2c146169f427 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 2d978d966b93..2d978d966b93 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/switchboard-plugs/a11y/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
index 859e04eb954d..859e04eb954d 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/about/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
index 6d7ecbffa314..6d7ecbffa314 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/lspci-path.patch b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/lspci-path.patch
index 352d84c42624..352d84c42624 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/lspci-path.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/lspci-path.patch
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/remove-update-button.patch b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/remove-update-button.patch
index 41433f9a76b0..41433f9a76b0 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/remove-update-button.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/remove-update-button.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 0d7586391ce0..0d7586391ce0 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 547b6d897e4e..547b6d897e4e 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/clock-format.patch b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/clock-format.patch
index 0fe0ac8b10c8..0fe0ac8b10c8 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/clock-format.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/clock-format.patch
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
index e1303a3cc48a..e1303a3cc48a 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 35f73d365990..35f73d365990 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 22fb795297e0..22fb795297e0 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 71f865bdeb62..71f865bdeb62 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 33237d9c9392..33237d9c9392 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 76edfa18add6..76edfa18add6 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/mouse-touchpad/hardcode-settings-daemon-gsettings.patch b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/hardcode-settings-daemon-gsettings.patch
index b904fe153094..b904fe153094 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/hardcode-settings-daemon-gsettings.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/hardcode-settings-daemon-gsettings.patch
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
index 283a13bd82aa..283a13bd82aa 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/nma.patch b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/nma.patch
index a5fff9d6a32b..a5fff9d6a32b 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/nma.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/nma.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 277f70cf984c..277f70cf984c 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 496a69ce1f6b..496a69ce1f6b 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 a1b019179d1b..a1b019179d1b 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 4d6a1f5c5c67..4d6a1f5c5c67 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/pantheon-shell/hardcode-gsettings.patch b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/hardcode-gsettings.patch
index d023e1b55ce6..d023e1b55ce6 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/hardcode-gsettings.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/hardcode-gsettings.patch
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
index 8a56a8535e8b..8a56a8535e8b 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 335d3f296262..335d3f296262 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/power/hardcode-gsettings.patch b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/power/hardcode-gsettings.patch
index caacdad6eda9..caacdad6eda9 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/hardcode-gsettings.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/power/hardcode-gsettings.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 293faad51c74..293faad51c74 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 d35844320a16..d35844320a16 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/security-privacy/hardcode-gsettings.patch b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/hardcode-gsettings.patch
index ffaf1ecf5db1..ffaf1ecf5db1 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/hardcode-gsettings.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/hardcode-gsettings.patch
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
index 265352ed8815..265352ed8815 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 907bdc37e2a7..907bdc37e2a7 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 12edf97f6ba9..12edf97f6ba9 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 f5d8567bffed..f5d8567bffed 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 f02f79b15a8a..f02f79b15a8a 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 1ce18a1ec401..1ce18a1ec401 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 23fb8445838a..23fb8445838a 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 061feb4b2d95..061feb4b2d95 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 430acfd9ac1a..430acfd9ac1a 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 898d5f7b454f..898d5f7b454f 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 039d75beb4f2..039d75beb4f2 100644
--- a/pkgs/desktops/pantheon/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/default.nix
diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/correct-override.patch b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/correct-override.patch
index 1b2dc835706d..1b2dc835706d 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/correct-override.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/correct-override.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 e7aea3be91ef..e7aea3be91ef 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 0cff31f4f777..0cff31f4f777 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 b25bb8c85904..b25bb8c85904 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 3bd7d531840d..3bd7d531840d 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 494edde183ca..494edde183ca 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 89536754964d..89536754964d 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 312c35d9bf00..312c35d9bf00 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 3b0f721a5644..3b0f721a5644 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 b0218bac52d7..b0218bac52d7 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 8b04efe417ea..8b04efe417ea 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-greeter/01-sysconfdir-install.patch b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/01-sysconfdir-install.patch
index 626e56ce5960..626e56ce5960 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-greeter/01-sysconfdir-install.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/01-sysconfdir-install.patch
diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
index a71736887bb1..a71736887bb1 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/gsd.patch b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/gsd.patch
index bcbf604c6a2e..bcbf604c6a2e 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-greeter/gsd.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/gsd.patch
diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/hardcode-theme.patch b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/hardcode-theme.patch
index e9263aab736e..e9263aab736e 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-greeter/hardcode-theme.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/hardcode-theme.patch
diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/numlockx.patch b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/numlockx.patch
index 2c7766b4284c..2c7766b4284c 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-greeter/numlockx.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/numlockx.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 2726ea2b9368..2726ea2b9368 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-print-shim/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix
index d8634b48570d..d8634b48570d 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-elementary-dockitems.desktop b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/default-elementary-dockitems.desktop
index 517a9457ae10..517a9457ae10 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default-elementary-dockitems.desktop
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/default-elementary-dockitems.desktop
diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
index 5fe22f0db816..5fe22f0db816 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/pantheon-mimeapps.list b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/pantheon-mimeapps.list
index 3b5e3b0e77a5..3b5e3b0e77a5 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 ca0ab888f149..ca0ab888f149 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 4e19a65b58d4..4e19a65b58d4 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 3b97e306119d..3b97e306119d 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 9117a7b8f743..9117a7b8f743 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 e83308ea5526..e83308ea5526 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 264a4a5b26da..264a4a5b26da 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 0d00ee2072dd..0d00ee2072dd 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/bluetooth/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
index 4d7868a1d14c..4d7868a1d14c 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 701296900603..701296900603 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 aa63f82c9652..aa63f82c9652 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 58e6853e606e..58e6853e606e 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 a201d6864a66..a201d6864a66 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 fd4e1cc7e177..fd4e1cc7e177 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 03369c3ad42e..03369c3ad42e 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 a9af53449c9a..a9af53449c9a 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 b6607d54a7e8..b6607d54a7e8 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 3e17813fde2a..3e17813fde2a 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 be6c89f9c05d..be6c89f9c05d 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 68a5fd532a8d..68a5fd532a8d 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 cfae604d3a53..cfae604d3a53 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 cc612407bf61..cc612407bf61 100644
--- a/pkgs/desktops/pantheon/granite/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/granite/default.nix
diff --git a/pkgs/desktops/pantheon/services/cerbere/default.nix b/nixpkgs/pkgs/desktops/pantheon/services/cerbere/default.nix
index da5e544b0058..da5e544b0058 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 d7d3cdb03125..d7d3cdb03125 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 055706b1521a..055706b1521a 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 a59c74f22b3b..a59c74f22b3b 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 54f556e3a92e..54f556e3a92e 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 d8514c51f4f7..d8514c51f4f7 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 272656fae78c..272656fae78c 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 c073b23e6b9f..c073b23e6b9f 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 79bc4bc6a012..79bc4bc6a012 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 d9e5512ce784..d9e5512ce784 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 0162de7349a3..0162de7349a3 100644
--- a/pkgs/desktops/pantheon/update.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/update.nix
diff --git a/pkgs/desktops/pantheon/update.sh b/nixpkgs/pkgs/desktops/pantheon/update.sh
index 9bbbe2600344..9bbbe2600344 100755
--- a/pkgs/desktops/pantheon/update.sh
+++ b/nixpkgs/pkgs/desktops/pantheon/update.sh
diff --git a/pkgs/desktops/plasma-5/bluedevil.nix b/nixpkgs/pkgs/desktops/plasma-5/bluedevil.nix
index b5ff3f5dd05d..b5ff3f5dd05d 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 eed396b54375..eed396b54375 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 1be3fe1c3098..1be3fe1c3098 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 48b038325fec..48b038325fec 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 5d5856d122dd..5d5856d122dd 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 8920e7ca5189..8920e7ca5189 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 3f3222e05cdb..3f3222e05cdb 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 d1bd9e957f71..d1bd9e957f71 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 a859285e0789..a859285e0789 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 034b57ec06a3..034b57ec06a3 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 d2870c27e659..d2870c27e659 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 3364ee2c0632..3364ee2c0632 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 8cfc947d30bd..8cfc947d30bd 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 f30a0a4588fa..f30a0a4588fa 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 69f7bc4e56a0..69f7bc4e56a0 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 7aad1acf6ac4..7aad1acf6ac4 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 569da3c70349..569da3c70349 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 398fc356fc93..398fc356fc93 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 ccbf3820b908..ccbf3820b908 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 77763c5e203e..77763c5e203e 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 b35493929ff3..b35493929ff3 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 016ea940d99b..016ea940d99b 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 422bb95c6059..422bb95c6059 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 e748121132c1..e748121132c1 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 39e260f6c708..39e260f6c708 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 150b97be50d7..150b97be50d7 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 1cbfb87ea563..1cbfb87ea563 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 1344b477f736..1344b477f736 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 b8f381e97149..b8f381e97149 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 60b8f5ef541f..60b8f5ef541f 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 80aacacc6ca0..80aacacc6ca0 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/series b/nixpkgs/pkgs/desktops/plasma-5/kwin/series
index 8efb74eabd67..8efb74eabd67 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 51f15c87d274..51f15c87d274 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 f6f6187e9462..f6f6187e9462 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 5625aa656ceb..5625aa656ceb 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 48be0d037df5..48be0d037df5 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 86bf4ab10602..86bf4ab10602 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 fbbb11ae7556..fbbb11ae7556 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 0f9fe40d73c3..0f9fe40d73c3 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 db019db358bb..db019db358bb 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 1b1f34f17b53..1b1f34f17b53 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 e01efabe8a6a..e01efabe8a6a 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 32bd5f3a9f28..32bd5f3a9f28 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 a46212af10fb..a46212af10fb 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 26517ba93565..26517ba93565 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 97504b330fed..97504b330fed 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 f69644287624..f69644287624 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 79b5cfb437e2..79b5cfb437e2 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 3bc871f09063..3bc871f09063 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 8296d549782f..8296d549782f 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 b60b5298d6db..b60b5298d6db 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 6bab35fe4a97..6bab35fe4a97 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 e016944be456..e016944be456 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 e1c325e16934..e1c325e16934 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 b2a7866531bf..b2a7866531bf 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 cb068166c1d9..cb068166c1d9 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 680021e350b7..680021e350b7 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 55a4518021ed..55a4518021ed 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 c25b3d2744b7..c25b3d2744b7 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 65fc5446c16e..65fc5446c16e 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 6becf3bf420b..6becf3bf420b 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 ac0a3494c226..ac0a3494c226 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 9ff906f79745..9ff906f79745 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 f46792fc48f7..f46792fc48f7 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 1e04eb1e2b00..1e04eb1e2b00 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 543e3ca897f1..543e3ca897f1 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 11bd80044595..11bd80044595 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/xfce/applications/gigolo.nix b/nixpkgs/pkgs/desktops/xfce/applications/gigolo.nix
index d0fc55e77e82..d0fc55e77e82 100644
--- a/pkgs/desktops/xfce/applications/gigolo.nix
+++ b/nixpkgs/pkgs/desktops/xfce/applications/gigolo.nix
diff --git a/pkgs/desktops/xfce/applications/mousepad-12134.patch b/nixpkgs/pkgs/desktops/xfce/applications/mousepad-12134.patch
index 74a28ecf61af..74a28ecf61af 100644
--- a/pkgs/desktops/xfce/applications/mousepad-12134.patch
+++ b/nixpkgs/pkgs/desktops/xfce/applications/mousepad-12134.patch
diff --git a/pkgs/desktops/xfce/applications/mousepad.nix b/nixpkgs/pkgs/desktops/xfce/applications/mousepad.nix
index 2dca1fa29b0f..2dca1fa29b0f 100644
--- a/pkgs/desktops/xfce/applications/mousepad.nix
+++ b/nixpkgs/pkgs/desktops/xfce/applications/mousepad.nix
diff --git a/pkgs/desktops/xfce/applications/orage.nix b/nixpkgs/pkgs/desktops/xfce/applications/orage.nix
index 19bd560cbaef..19bd560cbaef 100644
--- a/pkgs/desktops/xfce/applications/orage.nix
+++ b/nixpkgs/pkgs/desktops/xfce/applications/orage.nix
diff --git a/pkgs/desktops/xfce/applications/parole.nix b/nixpkgs/pkgs/desktops/xfce/applications/parole.nix
index ac0180c20fe8..ac0180c20fe8 100644
--- a/pkgs/desktops/xfce/applications/parole.nix
+++ b/nixpkgs/pkgs/desktops/xfce/applications/parole.nix
diff --git a/pkgs/desktops/xfce/applications/ristretto.nix b/nixpkgs/pkgs/desktops/xfce/applications/ristretto.nix
index 3c0e8040c3b2..3c0e8040c3b2 100644
--- a/pkgs/desktops/xfce/applications/ristretto.nix
+++ b/nixpkgs/pkgs/desktops/xfce/applications/ristretto.nix
diff --git a/pkgs/desktops/xfce/applications/terminal.nix b/nixpkgs/pkgs/desktops/xfce/applications/terminal.nix
index 31e851a469d7..31e851a469d7 100644
--- a/pkgs/desktops/xfce/applications/terminal.nix
+++ b/nixpkgs/pkgs/desktops/xfce/applications/terminal.nix
diff --git a/pkgs/desktops/xfce/applications/xfce4-mixer.nix b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-mixer.nix
index e1646d93a619..e1646d93a619 100644
--- a/pkgs/desktops/xfce/applications/xfce4-mixer.nix
+++ b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-mixer.nix
diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-notifyd.nix
index 19ecff290933..19ecff290933 100644
--- a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix
+++ b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-notifyd.nix
diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix
index 085cfd7b8f90..085cfd7b8f90 100644
--- a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix
+++ b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix
diff --git a/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
index 96f71e004a87..96f71e004a87 100644
--- a/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
+++ b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
diff --git a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse.nix b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-volumed-pulse.nix
index 4344d34f13f6..4344d34f13f6 100644
--- a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse.nix
+++ b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-volumed-pulse.nix
diff --git a/pkgs/desktops/xfce/applications/xfce4-volumed.nix b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-volumed.nix
index dafb72582b31..dafb72582b31 100644
--- a/pkgs/desktops/xfce/applications/xfce4-volumed.nix
+++ b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-volumed.nix
diff --git a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix b/nixpkgs/pkgs/desktops/xfce/art/xfce4-icon-theme.nix
index 6ac601c6685e..6ac601c6685e 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 783fbb13c83c..783fbb13c83c 100644
--- a/pkgs/desktops/xfce/art/xfwm4-themes.nix
+++ b/nixpkgs/pkgs/desktops/xfce/art/xfwm4-themes.nix
diff --git a/pkgs/desktops/xfce/core/exo.nix b/nixpkgs/pkgs/desktops/xfce/core/exo.nix
index 6b5ee4b31328..6b5ee4b31328 100644
--- a/pkgs/desktops/xfce/core/exo.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/exo.nix
diff --git a/pkgs/desktops/xfce/core/garcon-10967.patch b/nixpkgs/pkgs/desktops/xfce/core/garcon-10967.patch
index aea123255478..aea123255478 100644
--- a/pkgs/desktops/xfce/core/garcon-10967.patch
+++ b/nixpkgs/pkgs/desktops/xfce/core/garcon-10967.patch
diff --git a/pkgs/desktops/xfce/core/garcon-12700.patch b/nixpkgs/pkgs/desktops/xfce/core/garcon-12700.patch
index b95a65cc2194..b95a65cc2194 100644
--- a/pkgs/desktops/xfce/core/garcon-12700.patch
+++ b/nixpkgs/pkgs/desktops/xfce/core/garcon-12700.patch
diff --git a/pkgs/desktops/xfce/core/garcon.nix b/nixpkgs/pkgs/desktops/xfce/core/garcon.nix
index 41d98f17516d..41d98f17516d 100644
--- a/pkgs/desktops/xfce/core/garcon.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/garcon.nix
diff --git a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix b/nixpkgs/pkgs/desktops/xfce/core/gtk-xfce-engine.nix
index bb319e6fc6c3..bb319e6fc6c3 100644
--- a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/gtk-xfce-engine.nix
diff --git a/pkgs/desktops/xfce/core/libxfce4ui.nix b/nixpkgs/pkgs/desktops/xfce/core/libxfce4ui.nix
index 797b51de8e40..797b51de8e40 100644
--- a/pkgs/desktops/xfce/core/libxfce4ui.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/libxfce4ui.nix
diff --git a/pkgs/desktops/xfce/core/libxfce4util.nix b/nixpkgs/pkgs/desktops/xfce/core/libxfce4util.nix
index b68b7059f8df..b68b7059f8df 100644
--- a/pkgs/desktops/xfce/core/libxfce4util.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/libxfce4util.nix
diff --git a/pkgs/desktops/xfce/core/libxfcegui4.nix b/nixpkgs/pkgs/desktops/xfce/core/libxfcegui4.nix
index 5c61c16cbcc1..5c61c16cbcc1 100644
--- a/pkgs/desktops/xfce/core/libxfcegui4.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/libxfcegui4.nix
diff --git a/pkgs/desktops/xfce/core/thunar-build.nix b/nixpkgs/pkgs/desktops/xfce/core/thunar-build.nix
index 0b606ee5fdd7..0b606ee5fdd7 100644
--- a/pkgs/desktops/xfce/core/thunar-build.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/thunar-build.nix
diff --git a/pkgs/desktops/xfce/core/thunar-volman.nix b/nixpkgs/pkgs/desktops/xfce/core/thunar-volman.nix
index eda3aab070ac..eda3aab070ac 100644
--- a/pkgs/desktops/xfce/core/thunar-volman.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/thunar-volman.nix
diff --git a/pkgs/desktops/xfce/core/thunar.nix b/nixpkgs/pkgs/desktops/xfce/core/thunar.nix
index 83e3a2879d79..83e3a2879d79 100644
--- a/pkgs/desktops/xfce/core/thunar.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/thunar.nix
diff --git a/pkgs/desktops/xfce/core/thunarx_plugins_directory.patch b/nixpkgs/pkgs/desktops/xfce/core/thunarx_plugins_directory.patch
index e1431d86b147..e1431d86b147 100644
--- a/pkgs/desktops/xfce/core/thunarx_plugins_directory.patch
+++ b/nixpkgs/pkgs/desktops/xfce/core/thunarx_plugins_directory.patch
diff --git a/pkgs/desktops/xfce/core/tumbler.nix b/nixpkgs/pkgs/desktops/xfce/core/tumbler.nix
index 3e1d2be2b531..3e1d2be2b531 100644
--- a/pkgs/desktops/xfce/core/tumbler.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/tumbler.nix
diff --git a/pkgs/desktops/xfce/core/xfce4-appfinder.nix b/nixpkgs/pkgs/desktops/xfce/core/xfce4-appfinder.nix
index d39708dd523f..d39708dd523f 100644
--- a/pkgs/desktops/xfce/core/xfce4-appfinder.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/xfce4-appfinder.nix
diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools.nix b/nixpkgs/pkgs/desktops/xfce/core/xfce4-dev-tools.nix
index 109c22f1e58c..109c22f1e58c 100644
--- a/pkgs/desktops/xfce/core/xfce4-dev-tools.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/xfce4-dev-tools.nix
diff --git a/pkgs/desktops/xfce/core/xfce4-light-locker.patch b/nixpkgs/pkgs/desktops/xfce/core/xfce4-light-locker.patch
index 0fabdffd7ed6..0fabdffd7ed6 100644
--- a/pkgs/desktops/xfce/core/xfce4-light-locker.patch
+++ b/nixpkgs/pkgs/desktops/xfce/core/xfce4-light-locker.patch
diff --git a/pkgs/desktops/xfce/core/xfce4-panel-datadir.patch b/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel-datadir.patch
index ed9df9ef36f3..ed9df9ef36f3 100644
--- a/pkgs/desktops/xfce/core/xfce4-panel-datadir.patch
+++ b/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel-datadir.patch
diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel.nix
index b8ecae7e4e64..b8ecae7e4e64 100644
--- a/pkgs/desktops/xfce/core/xfce4-panel.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel.nix
diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager.nix b/nixpkgs/pkgs/desktops/xfce/core/xfce4-power-manager.nix
index 266f30645075..266f30645075 100644
--- a/pkgs/desktops/xfce/core/xfce4-power-manager.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/xfce4-power-manager.nix
diff --git a/pkgs/desktops/xfce/core/xfce4-session.nix b/nixpkgs/pkgs/desktops/xfce/core/xfce4-session.nix
index b57dd252033f..b57dd252033f 100644
--- a/pkgs/desktops/xfce/core/xfce4-session.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/xfce4-session.nix
diff --git a/pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch b/nixpkgs/pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch
index 2683b3c3dfdd..2683b3c3dfdd 100644
--- a/pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch
+++ b/nixpkgs/pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch
diff --git a/pkgs/desktops/xfce/core/xfce4-settings.nix b/nixpkgs/pkgs/desktops/xfce/core/xfce4-settings.nix
index 584055c8ddf6..584055c8ddf6 100644
--- a/pkgs/desktops/xfce/core/xfce4-settings.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/xfce4-settings.nix
diff --git a/pkgs/desktops/xfce/core/xfconf.nix b/nixpkgs/pkgs/desktops/xfce/core/xfconf.nix
index 9af365c6f14d..9af365c6f14d 100644
--- a/pkgs/desktops/xfce/core/xfconf.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/xfconf.nix
diff --git a/pkgs/desktops/xfce/core/xfdesktop.nix b/nixpkgs/pkgs/desktops/xfce/core/xfdesktop.nix
index 091dd03c0bcf..091dd03c0bcf 100644
--- a/pkgs/desktops/xfce/core/xfdesktop.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/xfdesktop.nix
diff --git a/pkgs/desktops/xfce/core/xfwm4.nix b/nixpkgs/pkgs/desktops/xfce/core/xfwm4.nix
index d26649ee6ce9..d26649ee6ce9 100644
--- a/pkgs/desktops/xfce/core/xfwm4.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/xfwm4.nix
diff --git a/pkgs/desktops/xfce/default.nix b/nixpkgs/pkgs/desktops/xfce/default.nix
index e5182a12d434..e5182a12d434 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/default.nix
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix
index 6399aa3cc20d..6399aa3cc20d 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix
index 280f39f8d997..280f39f8d997 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
index 07838f8fe7c9..07838f8fe7c9 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.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 e088e74cfb1c..e088e74cfb1c 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.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix
index c63170100312..c63170100312 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.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 8210fc62ccb4..8210fc62ccb4 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 b33ba7770be3..b33ba7770be3 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 e6d1f6da26b5..e6d1f6da26b5 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 3a79f67068c8..3a79f67068c8 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 6d0f8ee73a4c..6d0f8ee73a4c 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 039ac1440947..039ac1440947 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 79f0800ff34c..79f0800ff34c 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 541b30ec1b3d..541b30ec1b3d 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 5331c29a4546..5331c29a4546 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 8c6c91e25194..8c6c91e25194 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.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix
index e82669cc1a35..e82669cc1a35 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.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 d61dae6bdd56..d61dae6bdd56 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.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin.nix
index 6f6f5699b6e9..6f6f5699b6e9 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin.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 5a4dfee76fc4..5a4dfee76fc4 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 698d4aae5328..698d4aae5328 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 57cd48c6f270..57cd48c6f270 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 7134d29c9ffb..7134d29c9ffb 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 694f6772282b..694f6772282b 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 1ed86a67f727..1ed86a67f727 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.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix
index 96ef08cbeb70..96ef08cbeb70 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.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 15cd526d6def..15cd526d6def 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.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
index c29758452ae6..c29758452ae6 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.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 8798851579d8..8798851579d8 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.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix
index 307d2e81bf24..307d2e81bf24 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix
diff --git a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix b/nixpkgs/pkgs/desktops/xfce/thunar-plugins/archive/default.nix
index ea3a0f084439..ea3a0f084439 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 217cecf85a8c..217cecf85a8c 100644
--- a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix
diff --git a/pkgs/desktops/xfce4-13/automakeAddFlags.sh b/nixpkgs/pkgs/desktops/xfce4-13/automakeAddFlags.sh
index 92d5659d05ca..92d5659d05ca 100644
--- a/pkgs/desktops/xfce4-13/automakeAddFlags.sh
+++ b/nixpkgs/pkgs/desktops/xfce4-13/automakeAddFlags.sh
diff --git a/pkgs/desktops/xfce4-13/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/default.nix
index d3e46cf23654..d3e46cf23654 100644
--- a/pkgs/desktops/xfce4-13/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/default.nix
diff --git a/pkgs/desktops/xfce4-13/exo/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/exo/default.nix
index fa66b5c08e78..fa66b5c08e78 100644
--- a/pkgs/desktops/xfce4-13/exo/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/exo/default.nix
diff --git a/pkgs/desktops/xfce4-13/garcon/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/garcon/default.nix
index 487e384358a9..487e384358a9 100644
--- a/pkgs/desktops/xfce4-13/garcon/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/garcon/default.nix
diff --git a/pkgs/desktops/xfce4-13/gigolo/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/gigolo/default.nix
index 46b659b11d03..46b659b11d03 100644
--- a/pkgs/desktops/xfce4-13/gigolo/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/gigolo/default.nix
diff --git a/pkgs/desktops/xfce4-13/libxfce4ui/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/libxfce4ui/default.nix
index d760ed8bc710..d760ed8bc710 100644
--- a/pkgs/desktops/xfce4-13/libxfce4ui/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/libxfce4ui/default.nix
diff --git a/pkgs/desktops/xfce4-13/libxfce4util/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/libxfce4util/default.nix
index 1539b3f88d7d..1539b3f88d7d 100644
--- a/pkgs/desktops/xfce4-13/libxfce4util/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/libxfce4util/default.nix
diff --git a/pkgs/desktops/xfce4-13/mkXfceDerivation.nix b/nixpkgs/pkgs/desktops/xfce4-13/mkXfceDerivation.nix
index da7179c46462..da7179c46462 100644
--- a/pkgs/desktops/xfce4-13/mkXfceDerivation.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/mkXfceDerivation.nix
diff --git a/pkgs/desktops/xfce4-13/mousepad/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/mousepad/default.nix
index b5fd3a19d060..b5fd3a19d060 100644
--- a/pkgs/desktops/xfce4-13/mousepad/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/mousepad/default.nix
diff --git a/pkgs/desktops/xfce4-13/orage/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/orage/default.nix
index 3c8395a49088..3c8395a49088 100644
--- a/pkgs/desktops/xfce4-13/orage/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/orage/default.nix
diff --git a/pkgs/desktops/xfce4-13/parole/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/parole/default.nix
index f3a4561826e8..f3a4561826e8 100644
--- a/pkgs/desktops/xfce4-13/parole/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/parole/default.nix
diff --git a/pkgs/desktops/xfce4-13/ristretto/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/ristretto/default.nix
index b2da81399301..b2da81399301 100644
--- a/pkgs/desktops/xfce4-13/ristretto/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/ristretto/default.nix
diff --git a/pkgs/desktops/xfce4-13/thunar-volman/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/thunar-volman/default.nix
index 47900f344b3f..47900f344b3f 100644
--- a/pkgs/desktops/xfce4-13/thunar-volman/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/thunar-volman/default.nix
diff --git a/pkgs/desktops/xfce4-13/thunar/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/thunar/default.nix
index 5dbea2146c5d..5dbea2146c5d 100644
--- a/pkgs/desktops/xfce4-13/thunar/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/thunar/default.nix
diff --git a/pkgs/desktops/xfce4-13/tumbler/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/tumbler/default.nix
index 27f76fbcaaba..27f76fbcaaba 100644
--- a/pkgs/desktops/xfce4-13/tumbler/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/tumbler/default.nix
diff --git a/pkgs/desktops/xfce4-13/xfburn/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/xfburn/default.nix
index b8a61f6cf90c..b8a61f6cf90c 100644
--- a/pkgs/desktops/xfce4-13/xfburn/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/xfburn/default.nix
diff --git a/pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix
index d511f76ec1bd..d511f76ec1bd 100644
--- a/pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix
diff --git a/pkgs/desktops/xfce4-13/xfce4-battery-plugin/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-battery-plugin/default.nix
index 376551b09c0f..376551b09c0f 100644
--- a/pkgs/desktops/xfce4-13/xfce4-battery-plugin/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-battery-plugin/default.nix
diff --git a/pkgs/desktops/xfce4-13/xfce4-clipman-plugin/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-clipman-plugin/default.nix
index 74628a325d41..74628a325d41 100644
--- a/pkgs/desktops/xfce4-13/xfce4-clipman-plugin/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-clipman-plugin/default.nix
diff --git a/pkgs/desktops/xfce4-13/xfce4-cpufreq-plugin/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-cpufreq-plugin/default.nix
index 84cb74276997..84cb74276997 100644
--- a/pkgs/desktops/xfce4-13/xfce4-cpufreq-plugin/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-cpufreq-plugin/default.nix
diff --git a/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix
index 9dedb8674dc2..9dedb8674dc2 100644
--- a/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix
diff --git a/pkgs/desktops/xfce4-13/xfce4-dev-tools/setup-hook.sh b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-dev-tools/setup-hook.sh
index 600bf47fd872..600bf47fd872 100644
--- a/pkgs/desktops/xfce4-13/xfce4-dev-tools/setup-hook.sh
+++ b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-dev-tools/setup-hook.sh
diff --git a/pkgs/desktops/xfce4-13/xfce4-dict/configure-gio.patch b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-dict/configure-gio.patch
index 787b63511a23..787b63511a23 100644
--- a/pkgs/desktops/xfce4-13/xfce4-dict/configure-gio.patch
+++ b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-dict/configure-gio.patch
diff --git a/pkgs/desktops/xfce4-13/xfce4-dict/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-dict/default.nix
index 603863264efc..603863264efc 100644
--- a/pkgs/desktops/xfce4-13/xfce4-dict/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-dict/default.nix
diff --git a/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix
index a4bc0a3eaddb..a4bc0a3eaddb 100644
--- a/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix
diff --git a/pkgs/desktops/xfce4-13/xfce4-netload-plugin/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-netload-plugin/default.nix
index d9f517981d3e..d9f517981d3e 100644
--- a/pkgs/desktops/xfce4-13/xfce4-netload-plugin/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-netload-plugin/default.nix
diff --git a/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix
index 98ed6882a024..98ed6882a024 100644
--- a/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix
diff --git a/pkgs/desktops/xfce4-13/xfce4-panel/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-panel/default.nix
index c7551a7e6daf..c7551a7e6daf 100644
--- a/pkgs/desktops/xfce4-13/xfce4-panel/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-panel/default.nix
diff --git a/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix
index 0307738aee28..0307738aee28 100644
--- a/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix
diff --git a/pkgs/desktops/xfce4-13/xfce4-pulseaudio-plugin/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-pulseaudio-plugin/default.nix
index 185494c25439..185494c25439 100644
--- a/pkgs/desktops/xfce4-13/xfce4-pulseaudio-plugin/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-pulseaudio-plugin/default.nix
diff --git a/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix
index 95af146903b1..95af146903b1 100644
--- a/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix
diff --git a/pkgs/desktops/xfce4-13/xfce4-session/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-session/default.nix
index 6104f6324396..6104f6324396 100644
--- a/pkgs/desktops/xfce4-13/xfce4-session/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-session/default.nix
diff --git a/pkgs/desktops/xfce4-13/xfce4-settings/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-settings/default.nix
index 7e885c526d15..7e885c526d15 100644
--- a/pkgs/desktops/xfce4-13/xfce4-settings/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-settings/default.nix
diff --git a/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix
index 776b3797f769..776b3797f769 100644
--- a/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix
diff --git a/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix
index 6bc88ee76611..6bc88ee76611 100644
--- a/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix
diff --git a/pkgs/desktops/xfce4-13/xfce4-volumed-pulse/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-volumed-pulse/default.nix
index 626451c70d63..626451c70d63 100644
--- a/pkgs/desktops/xfce4-13/xfce4-volumed-pulse/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-volumed-pulse/default.nix
diff --git a/pkgs/desktops/xfce4-13/xfce4-whiskermenu-plugin/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-whiskermenu-plugin/default.nix
index 41cd491a7dc2..41cd491a7dc2 100644
--- a/pkgs/desktops/xfce4-13/xfce4-whiskermenu-plugin/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-whiskermenu-plugin/default.nix
diff --git a/pkgs/desktops/xfce4-13/xfce4-xkb-plugin/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-xkb-plugin/default.nix
index a024d3a88ba0..a024d3a88ba0 100644
--- a/pkgs/desktops/xfce4-13/xfce4-xkb-plugin/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/xfce4-xkb-plugin/default.nix
diff --git a/pkgs/desktops/xfce4-13/xfconf/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/xfconf/default.nix
index 691fc70644c9..691fc70644c9 100644
--- a/pkgs/desktops/xfce4-13/xfconf/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/xfconf/default.nix
diff --git a/pkgs/desktops/xfce4-13/xfdesktop/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/xfdesktop/default.nix
index 2d87c6ac987b..2d87c6ac987b 100644
--- a/pkgs/desktops/xfce4-13/xfdesktop/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/xfdesktop/default.nix
diff --git a/pkgs/desktops/xfce4-13/xfwm4/default.nix b/nixpkgs/pkgs/desktops/xfce4-13/xfwm4/default.nix
index c8106c8ec174..c8106c8ec174 100644
--- a/pkgs/desktops/xfce4-13/xfwm4/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce4-13/xfwm4/default.nix
diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
index fcdd2eb51811..fcdd2eb51811 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 e35444ed516e..e35444ed516e 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 2df5d16dbac6..2df5d16dbac6 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 e71c898dd555..e71c898dd555 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 2178226ab9d3..2178226ab9d3 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 83b72488bfd4..83b72488bfd4 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 182f8fbefab5..182f8fbefab5 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 0866311ad894..0866311ad894 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 45186914604d..45186914604d 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 a215ffc7d614..a215ffc7d614 100644
--- a/pkgs/development/arduino/platformio/fix-searchpath.patch
+++ b/nixpkgs/pkgs/development/arduino/platformio/fix-searchpath.patch
diff --git a/pkgs/development/beam-modules/build-erlang-mk.nix b/nixpkgs/pkgs/development/beam-modules/build-erlang-mk.nix
index 110c06e6f8ad..110c06e6f8ad 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 27ce64582f34..27ce64582f34 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 abe3c9e5122f..abe3c9e5122f 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 224d111026af..224d111026af 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 63d046c7b47e..63d046c7b47e 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 c55a7a80ff39..c55a7a80ff39 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 389e07beca6c..389e07beca6c 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-packages.nix b/nixpkgs/pkgs/development/beam-modules/hex-packages.nix
index df781d3e247c..df781d3e247c 100644
--- a/pkgs/development/beam-modules/hex-packages.nix
+++ b/nixpkgs/pkgs/development/beam-modules/hex-packages.nix
diff --git a/pkgs/development/beam-modules/hex-registry-snapshot.nix b/nixpkgs/pkgs/development/beam-modules/hex-registry-snapshot.nix
index fbd2950b6d53..fbd2950b6d53 100644
--- a/pkgs/development/beam-modules/hex-registry-snapshot.nix
+++ b/nixpkgs/pkgs/development/beam-modules/hex-registry-snapshot.nix
diff --git a/pkgs/development/beam-modules/hex/default.nix b/nixpkgs/pkgs/development/beam-modules/hex/default.nix
index e8faa9c0a9ce..e8faa9c0a9ce 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 db40c47794fa..db40c47794fa 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 d7a912ee1ed7..d7a912ee1ed7 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 d30b0fbdbd28..d30b0fbdbd28 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 18abe1055b5b..18abe1055b5b 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 1ec9f244d6c1..1ec9f244d6c1 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 4de7e3cc01ea..4de7e3cc01ea 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 ba15b5881602..ba15b5881602 100644
--- a/pkgs/development/bower-modules/generic/default.nix
+++ b/nixpkgs/pkgs/development/bower-modules/generic/default.nix
diff --git a/pkgs/development/compilers/abcl/default.nix b/nixpkgs/pkgs/development/compilers/abcl/default.nix
index c48b36e5aba5..c48b36e5aba5 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 40b690048eba..40b690048eba 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 7b16d6ad9dbc..7b16d6ad9dbc 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 8e8b157aa229..8e8b157aa229 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 d1db77215d16..d1db77215d16 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 755ffaab271e..755ffaab271e 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/sources.json b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json
index 03febb6aa355..03febb6aa355 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/sources.json
+++ b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json
diff --git a/pkgs/development/compilers/aldor/default.nix b/nixpkgs/pkgs/development/compilers/aldor/default.nix
index 604838e88316..604838e88316 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 08d0005c99eb..08d0005c99eb 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 78e2b28974e8..78e2b28974e8 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 d489037fef4a..d489037fef4a 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 e8759ec073b3..e8759ec073b3 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 ad68382c13ae..ad68382c13ae 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 519992fd8c26..519992fd8c26 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 ce754813dda1..ce754813dda1 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 3b4393720042..3b4393720042 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 4b216761259d..4b216761259d 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 002f34daa13b..002f34daa13b 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 93c6fa07d8a6..93c6fa07d8a6 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 df61ea2b791c..df61ea2b791c 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 8c5e123b61c4..8c5e123b61c4 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 67647b1edf69..67647b1edf69 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 387ae906b88d..387ae906b88d 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 88a34bd6fd6e..88a34bd6fd6e 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 bf2272a75c17..bf2272a75c17 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 8ebed6f4b5bd..8ebed6f4b5bd 100644
--- a/pkgs/development/compilers/binaryen/default.nix
+++ b/nixpkgs/pkgs/development/compilers/binaryen/default.nix
diff --git a/pkgs/development/compilers/bupc/default.nix b/nixpkgs/pkgs/development/compilers/bupc/default.nix
index ad10845e98cf..ad10845e98cf 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 65f0481a8010..65f0481a8010 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 646963eedbca..646963eedbca 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 9216c7791433..9216c7791433 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 ca72ba0119f0..ca72ba0119f0 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 ceeff56330b2..ceeff56330b2 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 8d29c7c9a2b5..8d29c7c9a2b5 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 d0f3b8a4e261..d0f3b8a4e261 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 4dc7ebe66717..4dc7ebe66717 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 1f786f127c91..1f786f127c91 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 d847ae9e29b9..d847ae9e29b9 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 204661063090..204661063090 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 d4d33a5593c3..d4d33a5593c3 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 9fdda9b6d9fe..9fdda9b6d9fe 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 b0d9b53b5378..b0d9b53b5378 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 a3b32ceee0cf..a3b32ceee0cf 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 8d29c7c9a2b5..8d29c7c9a2b5 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 21e12849b3ad..21e12849b3ad 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 3dc1c4afce98..3dc1c4afce98 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 2d3324ceaca4..2d3324ceaca4 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 b743d6e3229d..b743d6e3229d 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 d9adf510f22d..d9adf510f22d 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 24bfbd7a30f4..24bfbd7a30f4 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 2c63c0851048..2c63c0851048 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 2447aeb0ceae..2447aeb0ceae 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 a1e29951ddb5..a1e29951ddb5 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 3e0fbe6b996d..3e0fbe6b996d 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 91c163fd343a..91c163fd343a 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 e9e973618257..e9e973618257 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 dab724ea607c..dab724ea607c 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 9e3184c42eb2..9e3184c42eb2 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 470ea23aaf1b..470ea23aaf1b 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 237a80280ec8..237a80280ec8 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 33957b5a8dcf..33957b5a8dcf 100644
--- a/pkgs/development/compilers/compcert/default.nix
+++ b/nixpkgs/pkgs/development/compilers/compcert/default.nix
diff --git a/pkgs/development/compilers/coreclr/default.nix b/nixpkgs/pkgs/development/compilers/coreclr/default.nix
index 8be482e2150f..8be482e2150f 100644
--- a/pkgs/development/compilers/coreclr/default.nix
+++ b/nixpkgs/pkgs/development/compilers/coreclr/default.nix
diff --git a/pkgs/development/compilers/crystal/default.nix b/nixpkgs/pkgs/development/compilers/crystal/default.nix
index 2e823fe1f0f8..2e823fe1f0f8 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/nixpkgs/pkgs/development/compilers/crystal/default.nix
diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/nixpkgs/pkgs/development/compilers/cudatoolkit/default.nix
index 6a18c05f38e5..6a18c05f38e5 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 8bae6e2363f6..8bae6e2363f6 100644
--- a/pkgs/development/compilers/dale/default.nix
+++ b/nixpkgs/pkgs/development/compilers/dale/default.nix
diff --git a/pkgs/development/compilers/dale/link-llvm.patch b/nixpkgs/pkgs/development/compilers/dale/link-llvm.patch
index 3facec91874f..3facec91874f 100644
--- a/pkgs/development/compilers/dale/link-llvm.patch
+++ b/nixpkgs/pkgs/development/compilers/dale/link-llvm.patch
diff --git a/pkgs/development/compilers/dev86/default.nix b/nixpkgs/pkgs/development/compilers/dev86/default.nix
index 514075651e15..514075651e15 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 b3b58e836215..b3b58e836215 100644
--- a/pkgs/development/compilers/dmd/default.nix
+++ b/nixpkgs/pkgs/development/compilers/dmd/default.nix
diff --git a/pkgs/development/compilers/dotnet/sdk/default.nix b/nixpkgs/pkgs/development/compilers/dotnet/sdk/default.nix
index 6c1fa37e81a4..6c1fa37e81a4 100644
--- a/pkgs/development/compilers/dotnet/sdk/default.nix
+++ b/nixpkgs/pkgs/development/compilers/dotnet/sdk/default.nix
diff --git a/pkgs/development/compilers/dtc/default.nix b/nixpkgs/pkgs/development/compilers/dtc/default.nix
index ea305cc5c84c..ea305cc5c84c 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 c27f2a226705..c27f2a226705 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 33ed690772ea..33ed690772ea 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 eeb82cbfcab1..eeb82cbfcab1 100644
--- a/pkgs/development/compilers/ecl/default.upstream
+++ b/nixpkgs/pkgs/development/compilers/ecl/default.upstream
diff --git a/pkgs/development/compilers/edk2/default.nix b/nixpkgs/pkgs/development/compilers/edk2/default.nix
index 809fc6a4cf1a..809fc6a4cf1a 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 4635c6d0a4e8..4635c6d0a4e8 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 f0254d0f9547..f0254d0f9547 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 a819361f4d45..a819361f4d45 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 3da2445e0c52..3da2445e0c52 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 1bc8e61d27ca..1bc8e61d27ca 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 5b21736afc00..5b21736afc00 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 aaae9fa4ba9c..aaae9fa4ba9c 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 e1f941626dd7..e1f941626dd7 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 4edd9bebbc6b..4edd9bebbc6b 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 f6a0b9e24263..f6a0b9e24263 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 0e1835c6ffaa..0e1835c6ffaa 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 6bf7fa7890e8..6bf7fa7890e8 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 1039eb51fe27..1039eb51fe27 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-env.nix b/nixpkgs/pkgs/development/compilers/elm/packages/node-env.nix
index 720e0cc08503..720e0cc08503 100644
--- a/pkgs/development/compilers/elm/packages/node-env.nix
+++ b/nixpkgs/pkgs/development/compilers/elm/packages/node-env.nix
diff --git a/pkgs/development/compilers/elm/packages/node-packages.json b/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.json
index a0dff6fcdfee..a0dff6fcdfee 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 89753176f976..89753176f976 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 3a67954b78c9..3a67954b78c9 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/update.sh b/nixpkgs/pkgs/development/compilers/elm/update.sh
index 920b95e5ad95..920b95e5ad95 100755
--- a/pkgs/development/compilers/elm/update.sh
+++ b/nixpkgs/pkgs/development/compilers/elm/update.sh
diff --git a/pkgs/development/compilers/elm/versions.dat b/nixpkgs/pkgs/development/compilers/elm/versions.dat
index 9dcfd8a2808f..9dcfd8a2808f 100644
--- a/pkgs/development/compilers/elm/versions.dat
+++ b/nixpkgs/pkgs/development/compilers/elm/versions.dat
Binary files differdiff --git a/pkgs/development/compilers/emscripten/default.nix b/nixpkgs/pkgs/development/compilers/emscripten/default.nix
index d0af770a2a49..d0af770a2a49 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 57496d288605..57496d288605 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 91a42f53d282..91a42f53d282 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 1128fbe64ec3..1128fbe64ec3 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 0f9a1a94bcc9..0f9a1a94bcc9 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 8f45b0372469..8f45b0372469 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 57fc657ddcf3..57fc657ddcf3 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 f1498743dd67..f1498743dd67 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 c26ac151af49..c26ac151af49 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 47b90469234f..47b90469234f 100644
--- a/pkgs/development/compilers/fasm/default.nix
+++ b/nixpkgs/pkgs/development/compilers/fasm/default.nix
diff --git a/pkgs/development/compilers/fpc/binary-builder.sh b/nixpkgs/pkgs/development/compilers/fpc/binary-builder.sh
index 4308c1ed211a..4308c1ed211a 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 cf13ab6f5954..cf13ab6f5954 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 b516019ffc9a..b516019ffc9a 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 9f16c1b645cd..9f16c1b645cd 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 74ca246deb09..74ca246deb09 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 2de487cc9c8b..2de487cc9c8b 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 e0094c73098f..e0094c73098f 100644
--- a/pkgs/development/compilers/fsharp41/default.nix
+++ b/nixpkgs/pkgs/development/compilers/fsharp41/default.nix
diff --git a/pkgs/development/compilers/fstar/default.nix b/nixpkgs/pkgs/development/compilers/fstar/default.nix
index 94836e84fd68..94836e84fd68 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 65cd67f527d4..65cd67f527d4 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 65d16c48a616..65d16c48a616 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 303f6a30aadb..303f6a30aadb 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 5788f0df1da9..5788f0df1da9 100644
--- a/pkgs/development/compilers/gambit/unstable.nix
+++ b/nixpkgs/pkgs/development/compilers/gambit/unstable.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 9e5a172eed84..9e5a172eed84 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 80e042b5c2e9..80e042b5c2e9 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 ee57dcc8c144..ee57dcc8c144 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/default.nix b/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/default.nix
index 350eed2fedd0..350eed2fedd0 100644
--- a/pkgs/development/compilers/gcc-arm-embedded/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/default.nix
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix
index 8fba9be4901b..8fba9be4901b 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 3ce5ea1f64c2..3ce5ea1f64c2 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 4c98ca273a54..4c98ca273a54 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/5/default.nix b/nixpkgs/pkgs/development/compilers/gcc/5/default.nix
index e6115b104817..e6115b104817 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gcc/5/default.nix
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/nixpkgs/pkgs/development/compilers/gcc/6/default.nix
index 7644f4d3f623..7644f4d3f623 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 f9adbe9eb1ca..f9adbe9eb1ca 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 68c05d289784..68c05d289784 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 93d9cd1d60f5..93d9cd1d60f5 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 c7527ffb2b16..c7527ffb2b16 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 f5572c077f31..f5572c077f31 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 0d75de7557be..0d75de7557be 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 07a003691d6b..07a003691d6b 100644
--- a/pkgs/development/compilers/gcc/builder.sh
+++ b/nixpkgs/pkgs/development/compilers/gcc/builder.sh
diff --git a/pkgs/development/compilers/gcc/common/platform-flags.nix b/nixpkgs/pkgs/development/compilers/gcc/common/platform-flags.nix
index f3cdce411939..f3cdce411939 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/gfortran-darwin-NXConstStr.patch b/nixpkgs/pkgs/development/compilers/gcc/gfortran-darwin-NXConstStr.patch
index a7e158ca364b..a7e158ca364b 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 70708886b405..70708886b405 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 afd1f7456d32..afd1f7456d32 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 19db70597ce5..19db70597ce5 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 28fff80b786d..28fff80b786d 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 fb622b395806..fb622b395806 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 36df51904acf..36df51904acf 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 bc56ac698f5a..bc56ac698f5a 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 bc90888a3797..bc90888a3797 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 e970487786d0..e970487786d0 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 f9cfaec82026..f9cfaec82026 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 a07f6f1feb2f..a07f6f1feb2f 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 fc126b4813d6..fc126b4813d6 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 6e1ddb252c24..6e1ddb252c24 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 a84e9ffe2681..a84e9ffe2681 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 630ef6586e45..630ef6586e45 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 3892a56954e0..3892a56954e0 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 c7fb6d1f71cf..c7fb6d1f71cf 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 65a5ab028c1c..65a5ab028c1c 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 16450cf24ab4..16450cf24ab4 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 50d397d2cd47..50d397d2cd47 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 b20d6f9c47ef..b20d6f9c47ef 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 8c6b1a87cd37..8c6b1a87cd37 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 6e60ea6fea49..6e60ea6fea49 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 675522d54ead..675522d54ead 100644
--- a/pkgs/development/compilers/gforth/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gforth/default.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 9fe3a7d9dba3..9fe3a7d9dba3 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.2.2.nix b/nixpkgs/pkgs/development/compilers/ghc/8.2.2.nix
index 9b942da25a63..9b942da25a63 100644
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/nixpkgs/pkgs/development/compilers/ghc/8.2.2.nix
diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/nixpkgs/pkgs/development/compilers/ghc/8.4.4.nix
index a355f57a5c76..a355f57a5c76 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 7e845da5b648..7e845da5b648 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.4.nix b/nixpkgs/pkgs/development/compilers/ghc/8.6.4.nix
index ff9ef0a5c38a..ff9ef0a5c38a 100644
--- a/pkgs/development/compilers/ghc/8.6.4.nix
+++ b/nixpkgs/pkgs/development/compilers/ghc/8.6.4.nix
diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix
index 44ad6da2ff51..44ad6da2ff51 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 07b9cd1e1aaf..07b9cd1e1aaf 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/abi-depends-determinism.nix b/nixpkgs/pkgs/development/compilers/ghc/abi-depends-determinism.nix
index bc803b74617f..bc803b74617f 100644
--- a/pkgs/development/compilers/ghc/abi-depends-determinism.nix
+++ b/nixpkgs/pkgs/development/compilers/ghc/abi-depends-determinism.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 d0d94717d9c4..d0d94717d9c4 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 45af982c2973..45af982c2973 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 2edb49bd4633..2edb49bd4633 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.4/dep-overrides.nix b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.4/dep-overrides.nix
index efba0dc8634f..efba0dc8634f 100644
--- a/pkgs/development/compilers/ghcjs-ng/8.4/dep-overrides.nix
+++ b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.4/dep-overrides.nix
diff --git a/pkgs/development/compilers/ghcjs-ng/8.4/git.json b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.4/git.json
index cfa6cf1d7d26..cfa6cf1d7d26 100644
--- a/pkgs/development/compilers/ghcjs-ng/8.4/git.json
+++ b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.4/git.json
diff --git a/pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix
index 3b89db144979..3b89db144979 100644
--- a/pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix
+++ b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.4/stage0.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 53b6dd431342..53b6dd431342 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 37861b96e7aa..37861b96e7aa 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 a89ab15c55fd..a89ab15c55fd 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 99ad980c965e..99ad980c965e 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 52f3ad497ad6..52f3ad497ad6 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 56b69ea267f9..56b69ea267f9 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 068d7b578dfe..068d7b578dfe 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 7c10ce6572f8..7c10ce6572f8 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 f45ebb4511d6..f45ebb4511d6 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/ghcjs/base.nix b/nixpkgs/pkgs/development/compilers/ghcjs/base.nix
index e9c303b88b6e..e9c303b88b6e 100644
--- a/pkgs/development/compilers/ghcjs/base.nix
+++ b/nixpkgs/pkgs/development/compilers/ghcjs/base.nix
diff --git a/pkgs/development/compilers/ghcjs/gen-stage2.rb b/nixpkgs/pkgs/development/compilers/ghcjs/gen-stage2.rb
index 709e635db55c..709e635db55c 100755
--- a/pkgs/development/compilers/ghcjs/gen-stage2.rb
+++ b/nixpkgs/pkgs/development/compilers/ghcjs/gen-stage2.rb
diff --git a/pkgs/development/compilers/ghcjs/ghcjs-boot.nix b/nixpkgs/pkgs/development/compilers/ghcjs/ghcjs-boot.nix
index c00e13a92404..c00e13a92404 100644
--- a/pkgs/development/compilers/ghcjs/ghcjs-boot.nix
+++ b/nixpkgs/pkgs/development/compilers/ghcjs/ghcjs-boot.nix
diff --git a/pkgs/development/compilers/glslang/default.nix b/nixpkgs/pkgs/development/compilers/glslang/default.nix
index 3c46dfc107b8..3c46dfc107b8 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 ae27964ae8f0..ae27964ae8f0 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 41c325c2b1ad..41c325c2b1ad 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 69507685f29b..69507685f29b 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-jsonnet/deps.nix b/nixpkgs/pkgs/development/compilers/go-jsonnet/deps.nix
index 1f413a16d81d..1f413a16d81d 100644
--- a/pkgs/development/compilers/go-jsonnet/deps.nix
+++ b/nixpkgs/pkgs/development/compilers/go-jsonnet/deps.nix
diff --git a/pkgs/development/compilers/go/1.10.nix b/nixpkgs/pkgs/development/compilers/go/1.10.nix
index 39de36293c8e..39de36293c8e 100644
--- a/pkgs/development/compilers/go/1.10.nix
+++ b/nixpkgs/pkgs/development/compilers/go/1.10.nix
diff --git a/pkgs/development/compilers/go/1.11.nix b/nixpkgs/pkgs/development/compilers/go/1.11.nix
index d382bd90e479..d382bd90e479 100644
--- a/pkgs/development/compilers/go/1.11.nix
+++ b/nixpkgs/pkgs/development/compilers/go/1.11.nix
diff --git a/pkgs/development/compilers/go/1.12.nix b/nixpkgs/pkgs/development/compilers/go/1.12.nix
index 247845b6ad8c..247845b6ad8c 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.4.nix b/nixpkgs/pkgs/development/compilers/go/1.4.nix
index 95312f9e1ead..95312f9e1ead 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 98cec532dcca..98cec532dcca 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 6a18e6cc42e8..6a18e6cc42e8 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 a4d9f0674791..a4d9f0674791 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 13db40ababc3..13db40ababc3 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 1ea7f85d5290..1ea7f85d5290 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.patch b/nixpkgs/pkgs/development/compilers/go/remove-test-pie.patch
index fb8e116af76f..fb8e116af76f 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 cff35999a832..cff35999a832 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 807ab8e089c1..807ab8e089c1 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 e76ed61693a8..e76ed61693a8 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 7dce15eeb102..7dce15eeb102 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 5791b213cb59..5791b213cb59 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 1da07407d049..1da07407d049 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 afe5aea3d916..afe5aea3d916 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/ssl-cert-file-1.12.1.patch b/nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.12.1.patch
index aa3116d76c12..aa3116d76c12 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.9.patch b/nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.9.patch
index 3f27bc138c10..3f27bc138c10 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 b823bf9bdd44..b823bf9bdd44 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 25a9efa96415..25a9efa96415 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 38a29fd8fbfd..38a29fd8fbfd 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 bb9a00687124..bb9a00687124 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 0aa1bc9b88dd..0aa1bc9b88dd 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 b30f47c08e50..b30f47c08e50 100644
--- a/pkgs/development/compilers/graalvm/default.nix
+++ b/nixpkgs/pkgs/development/compilers/graalvm/default.nix
diff --git a/pkgs/development/compilers/graalvm/truffle.make b/nixpkgs/pkgs/development/compilers/graalvm/truffle.make
index da887c142408..da887c142408 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 f15e1060203b..f15e1060203b 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 683f8d7ace09..683f8d7ace09 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 2ab1e31adeb4..2ab1e31adeb4 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 0a974fccc888..0a974fccc888 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 e6496107a5ee..e6496107a5ee 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 010dacd0c71a..010dacd0c71a 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 61b6e5e8d8c3..61b6e5e8d8c3 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 3db916e6003c..3db916e6003c 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 2b5891256043..2b5891256043 100644
--- a/pkgs/development/compilers/iasl/default.nix
+++ b/nixpkgs/pkgs/development/compilers/iasl/default.nix
diff --git a/pkgs/development/compilers/icedtea-web/default.nix b/nixpkgs/pkgs/development/compilers/icedtea-web/default.nix
index 9390cbde6377..9390cbde6377 100644
--- a/pkgs/development/compilers/icedtea-web/default.nix
+++ b/nixpkgs/pkgs/development/compilers/icedtea-web/default.nix
diff --git a/pkgs/development/compilers/inform7/default.nix b/nixpkgs/pkgs/development/compilers/inform7/default.nix
index a6955c030519..a6955c030519 100644
--- a/pkgs/development/compilers/inform7/default.nix
+++ b/nixpkgs/pkgs/development/compilers/inform7/default.nix
diff --git a/pkgs/development/compilers/intercal/default.nix b/nixpkgs/pkgs/development/compilers/intercal/default.nix
index f601dc254a43..f601dc254a43 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 e64c0c912d94..e64c0c912d94 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 4604b1fdea72..4604b1fdea72 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 928b64e6fd9d..928b64e6fd9d 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 1cbe95232eb7..1cbe95232eb7 100644
--- a/pkgs/development/compilers/ispc/default.nix
+++ b/nixpkgs/pkgs/development/compilers/ispc/default.nix
diff --git a/pkgs/development/compilers/javacard-devkit/default.nix b/nixpkgs/pkgs/development/compilers/javacard-devkit/default.nix
index 06f321bc39c4..06f321bc39c4 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 08e3ec4f445f..08e3ec4f445f 100644
--- a/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix
diff --git a/pkgs/development/compilers/jikes/default.nix b/nixpkgs/pkgs/development/compilers/jikes/default.nix
index 1247f369c5c9..1247f369c5c9 100644
--- a/pkgs/development/compilers/jikes/default.nix
+++ b/nixpkgs/pkgs/development/compilers/jikes/default.nix
diff --git a/pkgs/development/compilers/jsonnet/default.nix b/nixpkgs/pkgs/development/compilers/jsonnet/default.nix
index 7bbad0e12016..7bbad0e12016 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 e0992d800033..e0992d800033 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 be4391399f55..be4391399f55 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 a679eda33066..a679eda33066 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 a868f949d27c..a868f949d27c 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 e4a164cfa1ad..e4a164cfa1ad 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 d8d521952bda..d8d521952bda 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 9800b33e7a9e..9800b33e7a9e 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 f49d63168d40..f49d63168d40 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 e4ef37e4721d..e4ef37e4721d 100644
--- a/pkgs/development/compilers/ldc/default.nix
+++ b/nixpkgs/pkgs/development/compilers/ldc/default.nix
diff --git a/pkgs/development/compilers/llvm/3.5/clang-purity.patch b/nixpkgs/pkgs/development/compilers/llvm/3.5/clang-purity.patch
index dc3b54e304fc..dc3b54e304fc 100644
--- a/pkgs/development/compilers/llvm/3.5/clang-purity.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.5/clang-purity.patch
diff --git a/pkgs/development/compilers/llvm/3.5/clang-separate-build.patch b/nixpkgs/pkgs/development/compilers/llvm/3.5/clang-separate-build.patch
index 5fb67f169f45..5fb67f169f45 100644
--- a/pkgs/development/compilers/llvm/3.5/clang-separate-build.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.5/clang-separate-build.patch
diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/nixpkgs/pkgs/development/compilers/llvm/3.5/clang.nix
index 7e0163577baf..7e0163577baf 100644
--- a/pkgs/development/compilers/llvm/3.5/clang.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.5/clang.nix
diff --git a/pkgs/development/compilers/llvm/3.5/default.nix b/nixpkgs/pkgs/development/compilers/llvm/3.5/default.nix
index b87fa747f145..b87fa747f145 100644
--- a/pkgs/development/compilers/llvm/3.5/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.5/default.nix
diff --git a/pkgs/development/compilers/llvm/3.5/dragonegg.nix b/nixpkgs/pkgs/development/compilers/llvm/3.5/dragonegg.nix
index d54ffd96382d..d54ffd96382d 100644
--- a/pkgs/development/compilers/llvm/3.5/dragonegg.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.5/dragonegg.nix
diff --git a/pkgs/development/compilers/llvm/3.5/fix-15974.patch b/nixpkgs/pkgs/development/compilers/llvm/3.5/fix-15974.patch
index 446004cd9988..446004cd9988 100644
--- a/pkgs/development/compilers/llvm/3.5/fix-15974.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.5/fix-15974.patch
diff --git a/pkgs/development/compilers/llvm/3.5/libc++/darwin.patch b/nixpkgs/pkgs/development/compilers/llvm/3.5/libc++/darwin.patch
index bf83f169cfc3..bf83f169cfc3 100644
--- a/pkgs/development/compilers/llvm/3.5/libc++/darwin.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.5/libc++/darwin.patch
diff --git a/pkgs/development/compilers/llvm/3.5/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/3.5/libc++/default.nix
index 6edd5e9798c7..6edd5e9798c7 100644
--- a/pkgs/development/compilers/llvm/3.5/libc++/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.5/libc++/default.nix
diff --git a/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh b/nixpkgs/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh
index 6611259165ae..6611259165ae 100644
--- a/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh
diff --git a/pkgs/development/compilers/llvm/3.5/libc++/xlocale-glibc-2.26.patch b/nixpkgs/pkgs/development/compilers/llvm/3.5/libc++/xlocale-glibc-2.26.patch
index 250bb49fc231..250bb49fc231 100644
--- a/pkgs/development/compilers/llvm/3.5/libc++/xlocale-glibc-2.26.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.5/libc++/xlocale-glibc-2.26.patch
diff --git a/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix b/nixpkgs/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix
index 268f2702a234..268f2702a234 100644
--- a/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix
diff --git a/pkgs/development/compilers/llvm/3.5/lld.nix b/nixpkgs/pkgs/development/compilers/llvm/3.5/lld.nix
index 4a398bd96a05..4a398bd96a05 100644
--- a/pkgs/development/compilers/llvm/3.5/lld.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.5/lld.nix
diff --git a/pkgs/development/compilers/llvm/3.5/lldb.nix b/nixpkgs/pkgs/development/compilers/llvm/3.5/lldb.nix
index a5161333b282..a5161333b282 100644
--- a/pkgs/development/compilers/llvm/3.5/lldb.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.5/lldb.nix
diff --git a/pkgs/development/compilers/llvm/3.5/llvm-separate-build.patch b/nixpkgs/pkgs/development/compilers/llvm/3.5/llvm-separate-build.patch
index abfc11513cdc..abfc11513cdc 100644
--- a/pkgs/development/compilers/llvm/3.5/llvm-separate-build.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.5/llvm-separate-build.patch
diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/3.5/llvm.nix
index 2645469767ad..2645469767ad 100644
--- a/pkgs/development/compilers/llvm/3.5/llvm.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.5/llvm.nix
diff --git a/pkgs/development/compilers/llvm/3.5/polly-separate-build.patch b/nixpkgs/pkgs/development/compilers/llvm/3.5/polly-separate-build.patch
index 618dd4dc3b12..618dd4dc3b12 100644
--- a/pkgs/development/compilers/llvm/3.5/polly-separate-build.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.5/polly-separate-build.patch
diff --git a/pkgs/development/compilers/llvm/3.5/polly.nix b/nixpkgs/pkgs/development/compilers/llvm/3.5/polly.nix
index bacf4d30556b..bacf4d30556b 100644
--- a/pkgs/development/compilers/llvm/3.5/polly.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.5/polly.nix
diff --git a/pkgs/development/compilers/llvm/3.8/D17533-1.patch b/nixpkgs/pkgs/development/compilers/llvm/3.8/D17533-1.patch
index 79ca953d6e5b..79ca953d6e5b 100644
--- a/pkgs/development/compilers/llvm/3.8/D17533-1.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.8/D17533-1.patch
diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/3.8/clang/default.nix
index cc25a41b0400..cc25a41b0400 100644
--- a/pkgs/development/compilers/llvm/3.8/clang/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.8/clang/default.nix
diff --git a/pkgs/development/compilers/llvm/3.8/clang/purity.patch b/nixpkgs/pkgs/development/compilers/llvm/3.8/clang/purity.patch
index 2d1c68d865e6..2d1c68d865e6 100644
--- a/pkgs/development/compilers/llvm/3.8/clang/purity.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.8/clang/purity.patch
diff --git a/pkgs/development/compilers/llvm/3.8/default.nix b/nixpkgs/pkgs/development/compilers/llvm/3.8/default.nix
index a848c8b9252b..a848c8b9252b 100644
--- a/pkgs/development/compilers/llvm/3.8/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.8/default.nix
diff --git a/pkgs/development/compilers/llvm/3.8/fix-llvm-config.patch b/nixpkgs/pkgs/development/compilers/llvm/3.8/fix-llvm-config.patch
index 6e56c67c8977..6e56c67c8977 100644
--- a/pkgs/development/compilers/llvm/3.8/fix-llvm-config.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.8/fix-llvm-config.patch
diff --git a/pkgs/development/compilers/llvm/3.8/libc++/darwin.patch b/nixpkgs/pkgs/development/compilers/llvm/3.8/libc++/darwin.patch
index 6dd756f01cc2..6dd756f01cc2 100644
--- a/pkgs/development/compilers/llvm/3.8/libc++/darwin.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.8/libc++/darwin.patch
diff --git a/pkgs/development/compilers/llvm/3.8/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/3.8/libc++/default.nix
index 5a0410302f2f..5a0410302f2f 100644
--- a/pkgs/development/compilers/llvm/3.8/libc++/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.8/libc++/default.nix
diff --git a/pkgs/development/compilers/llvm/3.8/libc++/setup-hook.sh b/nixpkgs/pkgs/development/compilers/llvm/3.8/libc++/setup-hook.sh
index 6611259165ae..6611259165ae 100644
--- a/pkgs/development/compilers/llvm/3.8/libc++/setup-hook.sh
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.8/libc++/setup-hook.sh
diff --git a/pkgs/development/compilers/llvm/3.8/libc++abi.nix b/nixpkgs/pkgs/development/compilers/llvm/3.8/libc++abi.nix
index 8b25681c2dbf..8b25681c2dbf 100644
--- a/pkgs/development/compilers/llvm/3.8/libc++abi.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.8/libc++abi.nix
diff --git a/pkgs/development/compilers/llvm/3.8/lldb.nix b/nixpkgs/pkgs/development/compilers/llvm/3.8/lldb.nix
index d27786464c05..d27786464c05 100644
--- a/pkgs/development/compilers/llvm/3.8/lldb.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.8/lldb.nix
diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/3.8/llvm.nix
index 261a1d0f94ca..261a1d0f94ca 100644
--- a/pkgs/development/compilers/llvm/3.8/llvm.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.8/llvm.nix
diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/3.9/clang/default.nix
index f597c559dba6..f597c559dba6 100644
--- a/pkgs/development/compilers/llvm/3.9/clang/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.9/clang/default.nix
diff --git a/pkgs/development/compilers/llvm/3.9/clang/purity.patch b/nixpkgs/pkgs/development/compilers/llvm/3.9/clang/purity.patch
index f5fb4c73af47..f5fb4c73af47 100644
--- a/pkgs/development/compilers/llvm/3.9/clang/purity.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.9/clang/purity.patch
diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/nixpkgs/pkgs/development/compilers/llvm/3.9/default.nix
index 752790cdd853..752790cdd853 100644
--- a/pkgs/development/compilers/llvm/3.9/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.9/default.nix
diff --git a/pkgs/development/compilers/llvm/3.9/libc++/darwin.patch b/nixpkgs/pkgs/development/compilers/llvm/3.9/libc++/darwin.patch
index 6dd756f01cc2..6dd756f01cc2 100644
--- a/pkgs/development/compilers/llvm/3.9/libc++/darwin.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.9/libc++/darwin.patch
diff --git a/pkgs/development/compilers/llvm/3.9/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/3.9/libc++/default.nix
index bd2cc19d2e0b..bd2cc19d2e0b 100644
--- a/pkgs/development/compilers/llvm/3.9/libc++/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.9/libc++/default.nix
diff --git a/pkgs/development/compilers/llvm/3.9/libc++/setup-hook.sh b/nixpkgs/pkgs/development/compilers/llvm/3.9/libc++/setup-hook.sh
index 6611259165ae..6611259165ae 100644
--- a/pkgs/development/compilers/llvm/3.9/libc++/setup-hook.sh
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.9/libc++/setup-hook.sh
diff --git a/pkgs/development/compilers/llvm/3.9/libc++/xlocale-glibc-2.26.patch b/nixpkgs/pkgs/development/compilers/llvm/3.9/libc++/xlocale-glibc-2.26.patch
index 4cc042554c85..4cc042554c85 100644
--- a/pkgs/development/compilers/llvm/3.9/libc++/xlocale-glibc-2.26.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.9/libc++/xlocale-glibc-2.26.patch
diff --git a/pkgs/development/compilers/llvm/3.9/libc++abi.nix b/nixpkgs/pkgs/development/compilers/llvm/3.9/libc++abi.nix
index dffb207a32b6..dffb207a32b6 100644
--- a/pkgs/development/compilers/llvm/3.9/libc++abi.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.9/libc++abi.nix
diff --git a/pkgs/development/compilers/llvm/3.9/lldb.nix b/nixpkgs/pkgs/development/compilers/llvm/3.9/lldb.nix
index 52f27de8cdb5..52f27de8cdb5 100644
--- a/pkgs/development/compilers/llvm/3.9/lldb.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.9/lldb.nix
diff --git a/pkgs/development/compilers/llvm/3.9/llvm-outputs.patch b/nixpkgs/pkgs/development/compilers/llvm/3.9/llvm-outputs.patch
index 40096fa3497f..40096fa3497f 100644
--- a/pkgs/development/compilers/llvm/3.9/llvm-outputs.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.9/llvm-outputs.patch
diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/3.9/llvm.nix
index 174cb17908cc..174cb17908cc 100644
--- a/pkgs/development/compilers/llvm/3.9/llvm.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/3.9/llvm.nix
diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/4/clang/default.nix
index c6538282f23e..c6538282f23e 100644
--- a/pkgs/development/compilers/llvm/4/clang/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/4/clang/default.nix
diff --git a/pkgs/development/compilers/llvm/4/clang/purity.patch b/nixpkgs/pkgs/development/compilers/llvm/4/clang/purity.patch
index f5fb4c73af47..f5fb4c73af47 100644
--- a/pkgs/development/compilers/llvm/4/clang/purity.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/4/clang/purity.patch
diff --git a/pkgs/development/compilers/llvm/4/cmdline-help.patch b/nixpkgs/pkgs/development/compilers/llvm/4/cmdline-help.patch
index a693719c2cfa..a693719c2cfa 100644
--- a/pkgs/development/compilers/llvm/4/cmdline-help.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/4/cmdline-help.patch
diff --git a/pkgs/development/compilers/llvm/4/default.nix b/nixpkgs/pkgs/development/compilers/llvm/4/default.nix
index 9651dbb72f4d..9651dbb72f4d 100644
--- a/pkgs/development/compilers/llvm/4/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/4/default.nix
diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/4/libc++/default.nix
index 2b543b9d793a..2b543b9d793a 100644
--- a/pkgs/development/compilers/llvm/4/libc++/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/4/libc++/default.nix
diff --git a/pkgs/development/compilers/llvm/4/libc++/pthread_mach_thread_np.patch b/nixpkgs/pkgs/development/compilers/llvm/4/libc++/pthread_mach_thread_np.patch
index 8c71f1b815db..8c71f1b815db 100644
--- a/pkgs/development/compilers/llvm/4/libc++/pthread_mach_thread_np.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/4/libc++/pthread_mach_thread_np.patch
diff --git a/pkgs/development/compilers/llvm/4/libc++/setup-hook.sh b/nixpkgs/pkgs/development/compilers/llvm/4/libc++/setup-hook.sh
index 6611259165ae..6611259165ae 100644
--- a/pkgs/development/compilers/llvm/4/libc++/setup-hook.sh
+++ b/nixpkgs/pkgs/development/compilers/llvm/4/libc++/setup-hook.sh
diff --git a/pkgs/development/compilers/llvm/4/libc++/xlocale-glibc-2.26.patch b/nixpkgs/pkgs/development/compilers/llvm/4/libc++/xlocale-glibc-2.26.patch
index e411d85066b4..e411d85066b4 100644
--- a/pkgs/development/compilers/llvm/4/libc++/xlocale-glibc-2.26.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/4/libc++/xlocale-glibc-2.26.patch
diff --git a/pkgs/development/compilers/llvm/4/libc++abi.nix b/nixpkgs/pkgs/development/compilers/llvm/4/libc++abi.nix
index 735c5e9e7435..735c5e9e7435 100644
--- a/pkgs/development/compilers/llvm/4/libc++abi.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/4/libc++abi.nix
diff --git a/pkgs/development/compilers/llvm/4/lld.nix b/nixpkgs/pkgs/development/compilers/llvm/4/lld.nix
index cf6de26a9e83..cf6de26a9e83 100644
--- a/pkgs/development/compilers/llvm/4/lld.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/4/lld.nix
diff --git a/pkgs/development/compilers/llvm/4/lldb-libedit.patch b/nixpkgs/pkgs/development/compilers/llvm/4/lldb-libedit.patch
index 73459ce6c864..73459ce6c864 100644
--- a/pkgs/development/compilers/llvm/4/lldb-libedit.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/4/lldb-libedit.patch
diff --git a/pkgs/development/compilers/llvm/4/lldb.nix b/nixpkgs/pkgs/development/compilers/llvm/4/lldb.nix
index 0be8a4d41865..0be8a4d41865 100644
--- a/pkgs/development/compilers/llvm/4/lldb.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/4/lldb.nix
diff --git a/pkgs/development/compilers/llvm/4/llvm-outputs.patch b/nixpkgs/pkgs/development/compilers/llvm/4/llvm-outputs.patch
index 40096fa3497f..40096fa3497f 100644
--- a/pkgs/development/compilers/llvm/4/llvm-outputs.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/4/llvm-outputs.patch
diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/4/llvm.nix
index ecb18a580540..ecb18a580540 100644
--- a/pkgs/development/compilers/llvm/4/llvm.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/4/llvm.nix
diff --git a/pkgs/development/compilers/llvm/4/openmp.nix b/nixpkgs/pkgs/development/compilers/llvm/4/openmp.nix
index a8a6b3dfea87..a8a6b3dfea87 100644
--- a/pkgs/development/compilers/llvm/4/openmp.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/4/openmp.nix
diff --git a/pkgs/development/compilers/llvm/4/sanitizers-nongnu.patch b/nixpkgs/pkgs/development/compilers/llvm/4/sanitizers-nongnu.patch
index 5bd858f8ae79..5bd858f8ae79 100644
--- a/pkgs/development/compilers/llvm/4/sanitizers-nongnu.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/4/sanitizers-nongnu.patch
diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/5/clang/default.nix
index 5fd0271f0261..5fd0271f0261 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 b30d0d0b5d5b..b30d0d0b5d5b 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 8f4c76bca1eb..8f4c76bca1eb 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 19833e4d3d4a..19833e4d3d4a 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 6807240df81e..6807240df81e 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/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/5/libc++/default.nix
index b182f1250e72..b182f1250e72 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 6611259165ae..6611259165ae 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 227ecbeda194..227ecbeda194 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 bf23f80ef103..bf23f80ef103 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 7be9a7e47b74..7be9a7e47b74 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 40096fa3497f..40096fa3497f 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 122576cc726e..122576cc726e 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 901015bf2ff4..901015bf2ff4 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 c9ddfe45c898..c9ddfe45c898 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 840567496785..840567496785 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 b30d0d0b5d5b..b30d0d0b5d5b 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 8f4c76bca1eb..8f4c76bca1eb 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 be18a315f12a..be18a315f12a 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 ae51c19ec728..ae51c19ec728 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 3a165e9da7b1..3a165e9da7b1 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 6611259165ae..6611259165ae 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 df9c784a10f4..df9c784a10f4 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 1e68276945ec..1e68276945ec 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 d33de2488350..d33de2488350 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 40096fa3497f..40096fa3497f 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 9237d442b776..9237d442b776 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 908a5f1218f7..908a5f1218f7 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 6266eb1958d1..6266eb1958d1 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 72a2a7331930..72a2a7331930 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 a4877b3fe6f5..a4877b3fe6f5 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 b30d0d0b5d5b..b30d0d0b5d5b 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 3cc12b94b200..3cc12b94b200 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 989529ff8cc8..989529ff8cc8 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 e63be181f95c..e63be181f95c 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 7f99cc9ae2cd..7f99cc9ae2cd 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 e2ec4e274f4c..e2ec4e274f4c 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 6611259165ae..6611259165ae 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 2fe6f1c58f66..2fe6f1c58f66 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 63ad43e62cd7..63ad43e62cd7 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 f58871f1d7cd..f58871f1d7cd 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 40096fa3497f..40096fa3497f 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 dc10de26ba10..dc10de26ba10 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 e55f4aa5ba13..e55f4aa5ba13 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 1f2ac97818eb..1f2ac97818eb 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 72a2a7331930..72a2a7331930 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 eb57d3458228..eb57d3458228 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/default.nix b/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix
index 5a8b8922eb06..5a8b8922eb06 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 b30d0d0b5d5b..b30d0d0b5d5b 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 d1f86a162327..d1f86a162327 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 6958fce60cef..6958fce60cef 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 3cc12b94b200..3cc12b94b200 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 a8bbb1f719bf..a8bbb1f719bf 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 e63be181f95c..e63be181f95c 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 48cf9e5e589c..48cf9e5e589c 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 3d67c37dcdd7..3d67c37dcdd7 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 6611259165ae..6611259165ae 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 bb5b368267f2..bb5b368267f2 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 787f3e16500e..787f3e16500e 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 4ebfe46aa813..4ebfe46aa813 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 a4ceb9102ef8..a4ceb9102ef8 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 7fff6843c5f4..7fff6843c5f4 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 ae9198e99d27..ae9198e99d27 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 40096fa3497f..40096fa3497f 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 18013a9cfad5..18013a9cfad5 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 bf85cae5abe7..bf85cae5abe7 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 1f2ac97818eb..1f2ac97818eb 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/TLI-musl.patch b/nixpkgs/pkgs/development/compilers/llvm/TLI-musl.patch
index 1a6908086637..1a6908086637 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 205074e48e4e..205074e48e4e 100644
--- a/pkgs/development/compilers/llvm/aarch64.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/aarch64.patch
diff --git a/pkgs/development/compilers/llvm/dynamiclibrary-musl.patch b/nixpkgs/pkgs/development/compilers/llvm/dynamiclibrary-musl.patch
index d5d7f07b5e11..d5d7f07b5e11 100644
--- a/pkgs/development/compilers/llvm/dynamiclibrary-musl.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/dynamiclibrary-musl.patch
diff --git a/pkgs/development/compilers/llvm/fix-llvm-config.patch b/nixpkgs/pkgs/development/compilers/llvm/fix-llvm-config.patch
index 772c49609275..772c49609275 100644
--- a/pkgs/development/compilers/llvm/fix-llvm-config.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/fix-llvm-config.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 bcb5ad8cfb87..bcb5ad8cfb87 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/libcxx-max_align_t.patch b/nixpkgs/pkgs/development/compilers/llvm/libcxx-max_align_t.patch
index 060be5b23de8..060be5b23de8 100644
--- a/pkgs/development/compilers/llvm/libcxx-max_align_t.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/libcxx-max_align_t.patch
diff --git a/pkgs/development/compilers/llvm/multi.nix b/nixpkgs/pkgs/development/compilers/llvm/multi.nix
index b4f2f8f9d6f6..b4f2f8f9d6f6 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 efbf8561b7ff..efbf8561b7ff 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 21ec23452055..21ec23452055 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 ab1833b3cfe9..ab1833b3cfe9 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 4b3ff844977e..4b3ff844977e 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 014fc226607a..014fc226607a 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 9ce7c9166bca..9ce7c9166bca 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 b7fc3e4dd772..b7fc3e4dd772 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 3869bdad84f6..3869bdad84f6 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 c0b535747133..c0b535747133 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 f15a76243277..f15a76243277 100644
--- a/pkgs/development/compilers/microscheme/default.nix
+++ b/nixpkgs/pkgs/development/compilers/microscheme/default.nix
diff --git a/pkgs/development/compilers/mint/crystal2nix.cr b/nixpkgs/pkgs/development/compilers/mint/crystal2nix.cr
index f608102a37b4..f608102a37b4 100644
--- a/pkgs/development/compilers/mint/crystal2nix.cr
+++ b/nixpkgs/pkgs/development/compilers/mint/crystal2nix.cr
diff --git a/pkgs/development/compilers/mint/default.nix b/nixpkgs/pkgs/development/compilers/mint/default.nix
index 1c8e9fb7eb20..1c8e9fb7eb20 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 dc6866e3af3d..dc6866e3af3d 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 ef7ad9b32669..ef7ad9b32669 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 72626ec0014b..72626ec0014b 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 f495be8a93e4..f495be8a93e4 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 0589733cb3c6..0589733cb3c6 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 aaf588851402..aaf588851402 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 3a3538a7ea42..3a3538a7ea42 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 c4dc9c430bc2..c4dc9c430bc2 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 3c748e2dff7d..3c748e2dff7d 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 0db13308a5af..0db13308a5af 100644
--- a/pkgs/development/compilers/mono/5.nix
+++ b/nixpkgs/pkgs/development/compilers/mono/5.nix
diff --git a/pkgs/development/compilers/mono/generic.nix b/nixpkgs/pkgs/development/compilers/mono/generic.nix
index 43ef5d4b62d1..43ef5d4b62d1 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 616ec420d2d0..616ec420d2d0 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 7632d850391e..7632d850391e 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 89726f20c6b8..89726f20c6b8 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 ef6cd1160b33..ef6cd1160b33 100644
--- a/pkgs/development/compilers/mozart/binary.nix
+++ b/nixpkgs/pkgs/development/compilers/mozart/binary.nix
diff --git a/pkgs/development/compilers/mruby/default.nix b/nixpkgs/pkgs/development/compilers/mruby/default.nix
index 03f3d56fd93d..03f3d56fd93d 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 bfb3c154a3c7..bfb3c154a3c7 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 e2aa5736c7a3..e2aa5736c7a3 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 ec5deb4e22aa..ec5deb4e22aa 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 77d8710cdf93..77d8710cdf93 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 6bd4af05da36..6bd4af05da36 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 0d171a474a20..0d171a474a20 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 e3a5b74a9cb2..e3a5b74a9cb2 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 4337de702e16..4337de702e16 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 99a65dec1501..99a65dec1501 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 e65510c172e6..e65510c172e6 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 4b867bbb1e6f..4b867bbb1e6f 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 8636f670059c..8636f670059c 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 0a30ef1352c4..0a30ef1352c4 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 aa6cf68d2c96..aa6cf68d2c96 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 9ac53f567909..9ac53f567909 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 c9536c487d05..c9536c487d05 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 4f49bcf80728..4f49bcf80728 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 a63b06a9f628..a63b06a9f628 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 b54b8a6288fe..b54b8a6288fe 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 c1952f30ba68..c1952f30ba68 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 4f9b8ebd294c..4f9b8ebd294c 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/ber-metaocaml.nix b/nixpkgs/pkgs/development/compilers/ocaml/ber-metaocaml.nix
index a933151de12a..a933151de12a 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 a1807682d867..a1807682d867 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 9c8705855120..9c8705855120 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 d7d9c863858f..d7d9c863858f 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 0085739147bf..0085739147bf 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 dc2bcb869766..dc2bcb869766 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 e9adbeff4904..e9adbeff4904 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 cdef9cafb932..cdef9cafb932 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 d153fb67d419..d153fb67d419 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 06ed7c51e9ab..06ed7c51e9ab 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 e11bb7251a60..e11bb7251a60 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 8e732d7d8bf4..8e732d7d8bf4 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 8172bc821905..8172bc821905 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 f8de96989967..f8de96989967 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 3f593dbcd6d6..3f593dbcd6d6 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 952c5d1bf6ae..952c5d1bf6ae 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 e58888cc9ed8..e58888cc9ed8 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 e058eff07466..e058eff07466 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 2ff0fcc3d411..2ff0fcc3d411 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 61c2d57423e4..61c2d57423e4 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 7457ffceab1f..7457ffceab1f 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 54239e58002f..54239e58002f 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/fix-java-home-jdk10.patch b/nixpkgs/pkgs/development/compilers/openjdk/fix-java-home-jdk10.patch
index c037fde29722..c037fde29722 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 6189412c999c..6189412c999c 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 3bdd42f7274f..3bdd42f7274f 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/make-bootstrap.nix b/nixpkgs/pkgs/development/compilers/openjdk/make-bootstrap.nix
index aac54417e2a8..aac54417e2a8 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 4ee007281e29..4ee007281e29 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/read-truststore-from-env-jdk10.patch b/nixpkgs/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch
index 6203064f5c06..6203064f5c06 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 4902b8e84011..4902b8e84011 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 b9258c500db4..b9258c500db4 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 9538aade6726..9538aade6726 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 690707265b4a..690707265b4a 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 459bfce50988..459bfce50988 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 ea6b9d2a9fe7..ea6b9d2a9fe7 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 d9ee5010f7cf..d9ee5010f7cf 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 9fab02ab5361..9fab02ab5361 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 4540a3016106..4540a3016106 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 ff4e387f07e7..ff4e387f07e7 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 ccd149bbb404..ccd149bbb404 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 2d98699d2836..2d98699d2836 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 d94bef9ec7f5..d94bef9ec7f5 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 a118e7ab73ba..a118e7ab73ba 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 7885582ad125..7885582ad125 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 b520a5e703c8..b520a5e703c8 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 7f22f4de6244..7f22f4de6244 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 b7feed84c37f..b7feed84c37f 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 91a3bb45352f..91a3bb45352f 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 e16e2c514a85..e16e2c514a85 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 f8c996137af9..f8c996137af9 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 821a9b8125cd..821a9b8125cd 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 68b676d5a3ef..68b676d5a3ef 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 d25cd9fee770..d25cd9fee770 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 a3547e206b7c..a3547e206b7c 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 8bf5a23f3469..8bf5a23f3469 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 5f01298960cd..5f01298960cd 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 d7315b73c9b5..d7315b73c9b5 100644
--- a/pkgs/development/compilers/qbe/default.nix
+++ b/nixpkgs/pkgs/development/compilers/qbe/default.nix
diff --git a/pkgs/development/compilers/reason/default.nix b/nixpkgs/pkgs/development/compilers/reason/default.nix
index 1b84b9348520..1b84b9348520 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 eee4507d6cec..eee4507d6cec 100644
--- a/pkgs/development/compilers/rgbds/default.nix
+++ b/nixpkgs/pkgs/development/compilers/rgbds/default.nix
diff --git a/pkgs/development/compilers/rust/binaryBuild.nix b/nixpkgs/pkgs/development/compilers/rust/binaryBuild.nix
index cb2fba96e181..cb2fba96e181 100644
--- a/pkgs/development/compilers/rust/binaryBuild.nix
+++ b/nixpkgs/pkgs/development/compilers/rust/binaryBuild.nix
diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/nixpkgs/pkgs/development/compilers/rust/bootstrap.nix
index 5eccc92a0c7d..5eccc92a0c7d 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 9f576042787a..9f576042787a 100644
--- a/pkgs/development/compilers/rust/cargo.nix
+++ b/nixpkgs/pkgs/development/compilers/rust/cargo.nix
diff --git a/pkgs/development/compilers/rust/default.nix b/nixpkgs/pkgs/development/compilers/rust/default.nix
index 0e3de0c4ab98..0e3de0c4ab98 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/nixpkgs/pkgs/development/compilers/rust/default.nix
diff --git a/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch b/nixpkgs/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch
index 57abb3117ec1..57abb3117ec1 100644
--- a/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch
+++ b/nixpkgs/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch
diff --git a/pkgs/development/compilers/rust/patches/stdsimd-disable-doctest.patch b/nixpkgs/pkgs/development/compilers/rust/patches/stdsimd-disable-doctest.patch
index 6ef7fd0f7ce4..6ef7fd0f7ce4 100644
--- a/pkgs/development/compilers/rust/patches/stdsimd-disable-doctest.patch
+++ b/nixpkgs/pkgs/development/compilers/rust/patches/stdsimd-disable-doctest.patch
diff --git a/pkgs/development/compilers/rust/print-hashes.sh b/nixpkgs/pkgs/development/compilers/rust/print-hashes.sh
index 7eb00a30ad73..7eb00a30ad73 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/rust-src.nix b/nixpkgs/pkgs/development/compilers/rust/rust-src.nix
index 1b819a7f6068..1b819a7f6068 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 099e41805aba..099e41805aba 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/nixpkgs/pkgs/development/compilers/rust/rustc.nix
diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/nixpkgs/pkgs/development/compilers/sbcl/bootstrap.nix
index 056ad7454600..056ad7454600 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 e2cc7adc26e1..e2cc7adc26e1 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 16e0389ad031..16e0389ad031 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 a1f803b67193..a1f803b67193 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 ce863ef9c915..ce863ef9c915 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 ab27d93a7cf9..ab27d93a7cf9 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 ab42eae31a68..ab42eae31a68 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 7bc7fa3d4c24..7bc7fa3d4c24 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 4fd46c35a0a9..4fd46c35a0a9 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 a6abe6791d7e..a6abe6791d7e 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 e9c6b706e5ad..e9c6b706e5ad 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 7f4c895d85a0..7f4c895d85a0 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 2fe1f1f3f5a6..2fe1f1f3f5a6 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 b0ca96f23acf..b0ca96f23acf 100644
--- a/pkgs/development/compilers/smlnj/default.nix
+++ b/nixpkgs/pkgs/development/compilers/smlnj/default.nix
diff --git a/pkgs/development/compilers/solc/default.nix b/nixpkgs/pkgs/development/compilers/solc/default.nix
index 941f92fd322e..941f92fd322e 100644
--- a/pkgs/development/compilers/solc/default.nix
+++ b/nixpkgs/pkgs/development/compilers/solc/default.nix
diff --git a/pkgs/development/compilers/solc/patches/shared-libs-install.patch b/nixpkgs/pkgs/development/compilers/solc/patches/shared-libs-install.patch
index 382d49599c7f..382d49599c7f 100644
--- a/pkgs/development/compilers/solc/patches/shared-libs-install.patch
+++ b/nixpkgs/pkgs/development/compilers/solc/patches/shared-libs-install.patch
diff --git a/pkgs/development/compilers/souffle/default.nix b/nixpkgs/pkgs/development/compilers/souffle/default.nix
index 87eac5418625..87eac5418625 100644
--- a/pkgs/development/compilers/souffle/default.nix
+++ b/nixpkgs/pkgs/development/compilers/souffle/default.nix
diff --git a/pkgs/development/compilers/squeak/default.nix b/nixpkgs/pkgs/development/compilers/squeak/default.nix
index 25ea47978fcd..25ea47978fcd 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 09045ee2c11e..09045ee2c11e 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 bf452d21d1dc..bf452d21d1dc 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 94d0a4327d9d..94d0a4327d9d 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 79482ac10e69..79482ac10e69 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 5c1927acb7f1..5c1927acb7f1 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 5d766bc25901..5d766bc25901 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 1d0a6a9577aa..1d0a6a9577aa 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 df906f9c84c7..df906f9c84c7 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/libdispatch-fortify-fix.patch b/nixpkgs/pkgs/development/compilers/swift/patches/libdispatch-fortify-fix.patch
index d23a308d68f4..d23a308d68f4 100644
--- a/pkgs/development/compilers/swift/patches/libdispatch-fortify-fix.patch
+++ b/nixpkgs/pkgs/development/compilers/swift/patches/libdispatch-fortify-fix.patch
diff --git a/pkgs/development/compilers/swift/patches/llvm-include-dirs.patch b/nixpkgs/pkgs/development/compilers/swift/patches/llvm-include-dirs.patch
index 789c0be7e7a8..789c0be7e7a8 100644
--- a/pkgs/development/compilers/swift/patches/llvm-include-dirs.patch
+++ b/nixpkgs/pkgs/development/compilers/swift/patches/llvm-include-dirs.patch
diff --git a/pkgs/development/compilers/swift/purity.patch b/nixpkgs/pkgs/development/compilers/swift/purity.patch
index 832decdc41f5..832decdc41f5 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 b1f9ee799e5c..b1f9ee799e5c 100644
--- a/pkgs/development/compilers/terra/default.nix
+++ b/nixpkgs/pkgs/development/compilers/terra/default.nix
diff --git a/pkgs/development/compilers/teyjus/default.nix b/nixpkgs/pkgs/development/compilers/teyjus/default.nix
index 04efe1a91342..04efe1a91342 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 fa82d80633ad..fa82d80633ad 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 a5c3db65857f..a5c3db65857f 100644
--- a/pkgs/development/compilers/tinycc/default.nix
+++ b/nixpkgs/pkgs/development/compilers/tinycc/default.nix
diff --git a/pkgs/development/compilers/urn/default.nix b/nixpkgs/pkgs/development/compilers/urn/default.nix
index d5f0dcbec29f..d5f0dcbec29f 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 2300d63015b9..2300d63015b9 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 6400f6e13875..6400f6e13875 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 fdc1eabf513e..fdc1eabf513e 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 fc971c26492b..fc971c26492b 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/gvc-compat.patch b/nixpkgs/pkgs/development/compilers/vala/gvc-compat.patch
index 8c0d25098f14..8c0d25098f14 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 8252143e998b..8252143e998b 100644
--- a/pkgs/development/compilers/vala/setup-hook.sh
+++ b/nixpkgs/pkgs/development/compilers/vala/setup-hook.sh
diff --git a/pkgs/development/compilers/wcc/default.nix b/nixpkgs/pkgs/development/compilers/wcc/default.nix
index 8cb1e8e5f2cd..8cb1e8e5f2cd 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 5f83845a12a9..5f83845a12a9 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 88666148da3f..88666148da3f 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 3ad0bc25787e..3ad0bc25787e 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 5aea623b91d4..5aea623b91d4 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 afb1bcd5a0b0..afb1bcd5a0b0 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 19056ec2b6fd..19056ec2b6fd 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 35ad09320dec..35ad09320dec 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 fb1798ab819c..fb1798ab819c 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 908aa29e178f..908aa29e178f 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 d58f65102190..d58f65102190 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 82c6e58a7b03..82c6e58a7b03 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 fb01da8d59cc..fb01da8d59cc 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 4fe86c3fae18..4fe86c3fae18 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 874b99f2bebf..874b99f2bebf 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 e33b9427223e..e33b9427223e 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 cd7ddfefb84a..cd7ddfefb84a 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 00d088a4a92c..00d088a4a92c 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 dde0e2e03eb6..dde0e2e03eb6 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 bffa5172b0e4..bffa5172b0e4 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 a074b27ff658..a074b27ff658 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 59f2295e2153..59f2295e2153 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 faf7db09ff9b..faf7db09ff9b 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-ext-lib/default.nix b/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix
index cade2bd352eb..cade2bd352eb 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 513b046c0fee..513b046c0fee 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 57f31e1847c1..57f31e1847c1 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 28c651f9b16a..28c651f9b16a 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 c67342f1a2f7..c67342f1a2f7 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 e316a8b792da..e316a8b792da 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 e5fa11c5cad4..e5fa11c5cad4 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 e403f7d4fb5c..e403f7d4fb5c 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 b31fcde1b80b..b31fcde1b80b 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 4abaec6528a9..4abaec6528a9 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 09fbd5808459..09fbd5808459 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 c610039eeec9..c610039eeec9 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 03149bab58b1..03149bab58b1 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 0b97358d8639..0b97358d8639 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 ea26f3e1ca9d..ea26f3e1ca9d 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 30917fcb78f2..30917fcb78f2 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 0fa17e292faa..0fa17e292faa 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 d573eca809a2..d573eca809a2 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 0d9557623c36..0d9557623c36 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 c196bdbcd766..c196bdbcd766 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 86a1301d3c76..86a1301d3c76 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 472d3aeb2d08..472d3aeb2d08 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 e74b158d33a3..e74b158d33a3 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 01df38375efb..01df38375efb 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 883ed971b083..883ed971b083 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 fb966f762bc2..fb966f762bc2 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 b6632a86f31f..b6632a86f31f 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 ef673310ceb0..ef673310ceb0 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 a3b2f87f3787..a3b2f87f3787 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 e53482e0c00b..e53482e0c00b 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 f03e6e42739a..f03e6e42739a 100644
--- a/pkgs/development/em-modules/generic/default.nix
+++ b/nixpkgs/pkgs/development/em-modules/generic/default.nix
diff --git a/nixpkgs/pkgs/development/go-modules/generic/default.nix b/nixpkgs/pkgs/development/go-modules/generic/default.nix
new file mode 100644
index 000000000000..7ff86466a9ad
--- /dev/null
+++ b/nixpkgs/pkgs/development/go-modules/generic/default.nix
@@ -0,0 +1,212 @@
+{ go, cacert, git, lib, removeReferencesTo, stdenv }:
+
+let
+  buildGoPackage =
+    { name ? "${args'.pname}-${args'.version}"
+    , src
+    , buildInputs ? []
+    , nativeBuildInputs ? []
+    , passthru ? {}
+    , patches ? []
+
+    # modSha256 is the sha256 of the vendored dependencies
+    , modSha256
+
+    # We want parallel builds by default
+    , enableParallelBuilding ? true
+
+    # Disabled flag
+    , disabled ? false
+
+    # Do not enable this without good reason
+    # IE: programs coupled with the compiler
+    , allowGoReference ? false
+
+    , meta ? {}
+
+    , ... }@args':
+
+    with builtins;
+
+    let
+      args = removeAttrs args' [ "modSha256" "disabled" ];
+
+      removeReferences = [ ] ++ lib.optional (!allowGoReference) go;
+
+      removeExpr = refs: ''remove-references-to ${lib.concatMapStrings (ref: " -t ${ref}") refs}'';
+
+      go-modules = go.stdenv.mkDerivation {
+        name = "${name}-go-modules";
+
+        nativeBuildInputs = [ go git cacert ];
+
+        inherit (args) src;
+        inherit (go) GOOS GOARCH;
+
+        patches = args.patches or [];
+
+        GO111MODULE = "on";
+
+        impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
+          "GIT_PROXY_COMMAND" "SOCKS_SERVER"
+        ];
+
+        configurePhase = args.modConfigurePhase or ''
+          runHook preConfigure
+
+          export GOCACHE=$TMPDIR/go-cache
+          export GOPATH="$TMPDIR/go"
+          mkdir -p "''${GOPATH}/pkg/mod/cache/download"
+
+          runHook postConfigure
+        '';
+
+        buildPhase = args.modBuildPhase or ''
+          runHook preBuild
+
+          go mod download
+
+          runHook postBuild
+        '';
+
+        installPhase = args.modInstallPhase or ''
+          runHook preInstall
+
+          cp -r "''${GOPATH}/pkg/mod/cache/download" $out
+
+          runHook postInstall
+        '';
+
+        dontFixup = true;
+        outputHashMode = "recursive";
+        outputHashAlgo = "sha256";
+        outputHash = modSha256;
+      };
+
+      package = go.stdenv.mkDerivation (args // {
+        nativeBuildInputs = [ removeReferencesTo go ] ++ nativeBuildInputs;
+
+        inherit (go) GOOS GOARCH;
+
+        GO111MODULE = "on";
+
+        configurePhase = args.configurePhase or ''
+          runHook preConfigure
+
+          export GOCACHE=$TMPDIR/go-cache
+          export GOPATH="$TMPDIR/go"
+          export GOPROXY=file://${go-modules}
+
+          runHook postConfigure
+        '';
+
+        buildPhase = args.buildPhase or ''
+          runHook preBuild
+
+          buildGoDir() {
+            local d; local cmd;
+            cmd="$1"
+            d="$2"
+            . $TMPDIR/buildFlagsArray
+            echo "$d" | grep -q "\(/_\|examples\|Godeps\|testdata\)" && return 0
+            [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0
+            local OUT
+            if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" -v -p $NIX_BUILD_CORES $d 2>&1)"; then
+              if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then
+                echo "$OUT" >&2
+                return 1
+              fi
+            fi
+            if [ -n "$OUT" ]; then
+              echo "$OUT" >&2
+            fi
+            return 0
+          }
+
+          getGoDirs() {
+            local type;
+            type="$1"
+            if [ -n "$subPackages" ]; then
+              echo "$subPackages" | sed "s,\(^\| \),\1./,g"
+            else
+              find . -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort --unique
+            fi
+          }
+
+          if (( "''${NIX_DEBUG:-0}" >= 1 )); then
+            buildFlagsArray+=(-x)
+          fi
+
+          if [ ''${#buildFlagsArray[@]} -ne 0 ]; then
+            declare -p buildFlagsArray > $TMPDIR/buildFlagsArray
+          else
+            touch $TMPDIR/buildFlagsArray
+          fi
+          if [ -z "$enableParallelBuilding" ]; then
+              export NIX_BUILD_CORES=1
+          fi
+          for pkg in $(getGoDirs ""); do
+            echo "Building subPackage $pkg"
+            buildGoDir install "$pkg"
+          done
+        '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+          # normalize cross-compiled builds w.r.t. native builds
+          (
+            dir=$GOPATH/bin/${go.GOOS}_${go.GOARCH}
+            if [[ -n "$(shopt -s nullglob; echo $dir/*)" ]]; then
+              mv $dir/* $dir/..
+            fi
+            if [[ -d $dir ]]; then
+              rmdir $dir
+            fi
+          )
+        '' + ''
+          runHook postBuild
+        '';
+
+        doCheck = args.doCheck or false;
+        checkPhase = args.checkPhase or ''
+          runHook preCheck
+
+          for pkg in $(getGoDirs test); do
+            buildGoDir test "$pkg"
+          done
+
+          runHook postCheck
+        '';
+
+        installPhase = args.installPhase or ''
+          runHook preInstall
+
+          mkdir -p $out
+          dir="$GOPATH/bin"
+          [ -e "$dir" ] && cp -r $dir $out
+
+          runHook postInstall
+        '';
+
+        preFixup = (args.preFixup or "") + ''
+          find $out/bin -type f -exec ${removeExpr removeReferences} '{}' + || true
+        '';
+
+        disallowedReferences = lib.optional (!allowGoReference) go;
+
+        passthru = passthru // { inherit go go-modules; };
+
+        meta = {
+          # Add default meta information
+          platforms = go.meta.platforms or lib.platforms.all;
+        } // meta // {
+          # add an extra maintainer to every package
+          maintainers = (meta.maintainers or []) ++
+                        [ lib.maintainers.kalbasit ];
+        };
+      }) // {
+        overrideGoAttrs = f: buildGoPackage (args' // (f args'));
+      };
+    in if disabled then
+      throw "${package.name} not supported for go ${go.meta.branch}"
+    else
+      package;
+in
+  buildGoPackage
diff --git a/pkgs/development/go-modules/tools/setup-hook.sh b/nixpkgs/pkgs/development/go-modules/tools/setup-hook.sh
index e354e50c35aa..e354e50c35aa 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 b3386aaf24bf..b3386aaf24bf 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 e354e50c35aa..e354e50c35aa 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 592e6ad89994..592e6ad89994 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 cfb56790221e..cfb56790221e 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 26fffac0a131..26fffac0a131 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 cea464ad5d27..cea464ad5d27 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 8f6018582670..8f6018582670 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 e1e04ecfe699..e1e04ecfe699 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 35bcd7bfc2f3..35bcd7bfc2f3 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 a606b3ecf288..a606b3ecf288 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 e4a548ae376b..e4a548ae376b 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 b08d8313930b..b08d8313930b 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 c975b1e2a2ca..c975b1e2a2ca 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.2.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index de01fe4cd120..de01fe4cd120 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 e8c138e594cd..e8c138e594cd 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 8d0582a8d067..8d0582a8d067 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 dc3071e5fab3..dc3071e5fab3 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 09755e4cc947..09755e4cc947 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 489f363db6a0..489f363db6a0 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 ee519f903ca9..ee519f903ca9 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 9d40b8d98a2c..9d40b8d98a2c 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 43a3b82923ba..43a3b82923ba 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 a4f0399cf3c6..a4f0399cf3c6 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 87d3b5ae496c..87d3b5ae496c 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 184d45eda445..184d45eda445 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 c7443a42e5b6..c7443a42e5b6 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 223d19b70f03..223d19b70f03 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 c7fbab6ab88c..c7fbab6ab88c 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 6ab7da969119..6ab7da969119 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 35f56a12560a..35f56a12560a 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 a4c040673487..a4c040673487 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 b7b057f2dc20..b7b057f2dc20 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 3025812213bc..3025812213bc 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/bloomfilter-fix-on-32bit.patch b/nixpkgs/pkgs/development/haskell-modules/patches/bloomfilter-fix-on-32bit.patch
index 7b32dcb4ab6f..7b32dcb4ab6f 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/clock-0.7.2.patch b/nixpkgs/pkgs/development/haskell-modules/patches/clock-0.7.2.patch
index 8354c7fa5890..8354c7fa5890 100644
--- a/pkgs/development/haskell-modules/patches/clock-0.7.2.patch
+++ b/nixpkgs/pkgs/development/haskell-modules/patches/clock-0.7.2.patch
diff --git a/pkgs/development/haskell-modules/patches/dyre-nix.patch b/nixpkgs/pkgs/development/haskell-modules/patches/dyre-nix.patch
index 458e540e0c4a..458e540e0c4a 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 510e450945b8..510e450945b8 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 26ea0eaa5a8b..26ea0eaa5a8b 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 b3c75a26a035..b3c75a26a035 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 cc115029a7ad..cc115029a7ad 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 bf89d8daf9fc..bf89d8daf9fc 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 100a828a501a..100a828a501a 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 87fd2aeab21b..87fd2aeab21b 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-streamBody.patch b/nixpkgs/pkgs/development/haskell-modules/patches/servant-client-core-streamBody.patch
index ebadd215cb76..ebadd215cb76 100644
--- a/pkgs/development/haskell-modules/patches/servant-client-core-streamBody.patch
+++ b/nixpkgs/pkgs/development/haskell-modules/patches/servant-client-core-streamBody.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 acafadba031e..acafadba031e 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 4b4f370b17f2..4b4f370b17f2 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 cce011347f47..cce011347f47 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 44c184a5624a..44c184a5624a 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 49beed8549db..49beed8549db 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 80b7ccefbcfa..80b7ccefbcfa 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 4dcaa61829a8..4dcaa61829a8 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 38d25827d508..38d25827d508 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 844ce98cd4c3..844ce98cd4c3 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 3a915cd67f41..3a915cd67f41 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 ff19e52135c8..ff19e52135c8 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 c67d53f8d9c2..c67d53f8d9c2 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 ad63cb28399d..ad63cb28399d 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 0f6e258ee202..0f6e258ee202 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 91ee174dadff..91ee174dadff 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 c5e33f4594f2..c5e33f4594f2 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 a47739d52b1a..a47739d52b1a 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 de93d39395bc..de93d39395bc 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 5c37961b7cb3..5c37961b7cb3 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 71785483ce66..71785483ce66 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 2fe783da4486..2fe783da4486 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 7ccda5f21c06..7ccda5f21c06 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 1c515ec39754..1c515ec39754 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 47c6998a587d..47c6998a587d 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 7f3164f3160d..7f3164f3160d 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 8c808447f64c..8c808447f64c 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 c17ed9eefa29..c17ed9eefa29 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 e215e069609a..e215e069609a 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 8b968c9732ab..8b968c9732ab 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 9e0529628fef..9e0529628fef 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 bf0e609a6103..bf0e609a6103 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 06b8ec5e82d2..06b8ec5e82d2 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 c6d8d8cf9133..c6d8d8cf9133 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 882058bb1856..882058bb1856 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 47c2ee638c54..47c2ee638c54 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 79df925323ed..79df925323ed 100644
--- a/pkgs/development/idris-modules/hamt.nix
+++ b/nixpkgs/pkgs/development/idris-modules/hamt.nix
diff --git a/pkgs/development/idris-modules/heyting-algebra.nix b/nixpkgs/pkgs/development/idris-modules/heyting-algebra.nix
index 3fa546466c8a..3fa546466c8a 100644
--- a/pkgs/development/idris-modules/heyting-algebra.nix
+++ b/nixpkgs/pkgs/development/idris-modules/heyting-algebra.nix
diff --git a/pkgs/development/idris-modules/hezarfen.nix b/nixpkgs/pkgs/development/idris-modules/hezarfen.nix
index f538cb29850c..f538cb29850c 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 9e9736d25661..9e9736d25661 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 a44f0e70252d..a44f0e70252d 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 beec74a2f657..beec74a2f657 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 80e95745f033..80e95745f033 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 f317b980d529..f317b980d529 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 4e1d2f9c82eb..4e1d2f9c82eb 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 5629221d601b..5629221d601b 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 4365c588769b..4365c588769b 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 3a4c0954fe81..3a4c0954fe81 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 58f8a13864a4..58f8a13864a4 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 dae310cda053..dae310cda053 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 55169caaa101..55169caaa101 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 490fd7bd2ed0..490fd7bd2ed0 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 fd014db30ef7..fd014db30ef7 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 2346c89c48c4..2346c89c48c4 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 a4ac168dc4fb..a4ac168dc4fb 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 197cb1552cbd..197cb1552cbd 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 4ebffa3e87c2..4ebffa3e87c2 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 5ce9ad7e915d..5ce9ad7e915d 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 21b81f4a95c5..21b81f4a95c5 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 f9fbd26a0ddb..f9fbd26a0ddb 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 0f62d73b9dac..0f62d73b9dac 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 194b60bd2983..194b60bd2983 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 1c2a58a6b7cb..1c2a58a6b7cb 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 63cc2184504b..63cc2184504b 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 7ce290c824ec..7ce290c824ec 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 dab6913ee8bc..dab6913ee8bc 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 433fdf647697..433fdf647697 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 4495e60d6bb6..4495e60d6bb6 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 b0306040d730..b0306040d730 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 8e7428665cd2..8e7428665cd2 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 6db49c3c3c9f..6db49c3c3c9f 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 97ed06d307ad..97ed06d307ad 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 6d752fed0f98..6d752fed0f98 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 577482433029..577482433029 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 06982a0b2bad..06982a0b2bad 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 98f4b4ea4d63..98f4b4ea4d63 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 ccb575e270cc..ccb575e270cc 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 ffe1e46d86e1..ffe1e46d86e1 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 402b5a01b765..402b5a01b765 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 1823e76c290d..1823e76c290d 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 650d843be843..650d843be843 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 8f10f9bd247e..8f10f9bd247e 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 69042e27d3d5..69042e27d3d5 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 3a6dced48cee..3a6dced48cee 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 f6fdaf7a75e2..f6fdaf7a75e2 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 bf7e56cf8c09..bf7e56cf8c09 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 ddd0dec03a4a..ddd0dec03a4a 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 47136839d01a..47136839d01a 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 baceb2214e3c..baceb2214e3c 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 870bf1a6b9b8..870bf1a6b9b8 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 9e6f40b963ff..9e6f40b963ff 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 61efb8cd575e..61efb8cd575e 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 ebe92f468982..ebe92f468982 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 a88d07d1655f..a88d07d1655f 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 0449572da024..0449572da024 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 adbfbaf48a43..adbfbaf48a43 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 7dbe527b276c..7dbe527b276c 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 85794b09ae0b..85794b09ae0b 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 29d63f1d0048..29d63f1d0048 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 2ad0bc0285e5..2ad0bc0285e5 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 b597ba6fe789..b597ba6fe789 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 d6163022830d..d6163022830d 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 5dcfa42c92fc..5dcfa42c92fc 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 550535f30aee..550535f30aee 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 4b570c3a4672..4b570c3a4672 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 57ced325aad0..57ced325aad0 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 8df64de3acb6..8df64de3acb6 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 16f3e7f73e20..16f3e7f73e20 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 e1563599a8cc..e1563599a8cc 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 3e53c7f98dd7..3e53c7f98dd7 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 cfffdc890d1e..cfffdc890d1e 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 fa8996f0fb56..fa8996f0fb56 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 8e1df36e4127..8e1df36e4127 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 f3b253bfd220..f3b253bfd220 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 258aebe81727..258aebe81727 100644
--- a/pkgs/development/interpreters/eff/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/eff/default.nix
diff --git a/pkgs/development/interpreters/elixir/1.5.nix b/nixpkgs/pkgs/development/interpreters/elixir/1.5.nix
index d32f91275652..d32f91275652 100644
--- a/pkgs/development/interpreters/elixir/1.5.nix
+++ b/nixpkgs/pkgs/development/interpreters/elixir/1.5.nix
diff --git a/pkgs/development/interpreters/elixir/1.6.nix b/nixpkgs/pkgs/development/interpreters/elixir/1.6.nix
index 73afcbd1597e..73afcbd1597e 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 adbbbaff890b..adbbbaff890b 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 e240e1907e06..e240e1907e06 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 622f2343c6e1..622f2343c6e1 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 b7e98af21097..b7e98af21097 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 501eca3cf02a..501eca3cf02a 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 c263551de2da..c263551de2da 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 58b7fd71f0be..58b7fd71f0be 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 e0d4ecbc95ac..e0d4ecbc95ac 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 c408d21d9b31..c408d21d9b31 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 60eb6c8a6a5e..60eb6c8a6a5e 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 1af047f43bd7..1af047f43bd7 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 a795741869fc..a795741869fc 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 3962d154ba9f..3962d154ba9f 100644
--- a/pkgs/development/interpreters/erlang/setup-hook.sh
+++ b/nixpkgs/pkgs/development/interpreters/erlang/setup-hook.sh
diff --git a/pkgs/development/interpreters/falcon/default.nix b/nixpkgs/pkgs/development/interpreters/falcon/default.nix
index 857a1e5cd8df..857a1e5cd8df 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 a0d20b7ebe4f..a0d20b7ebe4f 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 f60e5d286140..f60e5d286140 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 efbd72dcefa8..efbd72dcefa8 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 6f5a5ec0f198..6f5a5ec0f198 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 158987d4e0ef..158987d4e0ef 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 24266d596765..24266d596765 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 4d0f342b211f..4d0f342b211f 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 7e7671f0da09..7e7671f0da09 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 49715bf256bb..49715bf256bb 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 076091a702a2..076091a702a2 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 b0eb7ac44dae..b0eb7ac44dae 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 8b9b853fb00d..8b9b853fb00d 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 f144296170ed..f144296170ed 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 b835e1613838..b835e1613838 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 c7fb4f70fc6a..c7fb4f70fc6a 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 73e700bde026..73e700bde026 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 bf04fee1e893..bf04fee1e893 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 2177ae22db56..2177ae22db56 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 a6acd603c815..a6acd603c815 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 3bec73ea0369..3bec73ea0369 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 6c0568d68134..6c0568d68134 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 11feb1170c2c..11feb1170c2c 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 546b2123826d..546b2123826d 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 704e3eb4031a..704e3eb4031a 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 c3b494783e74..c3b494783e74 100644
--- a/pkgs/development/interpreters/joker/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/joker/default.nix
diff --git a/pkgs/development/interpreters/joker/deps.nix b/nixpkgs/pkgs/development/interpreters/joker/deps.nix
index 4eff988796b3..4eff988796b3 100644
--- a/pkgs/development/interpreters/joker/deps.nix
+++ b/nixpkgs/pkgs/development/interpreters/joker/deps.nix
diff --git a/pkgs/development/interpreters/jruby/default.nix b/nixpkgs/pkgs/development/interpreters/jruby/default.nix
index 2e53ae1694f2..2e53ae1694f2 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 f822fdd9c8f0..f822fdd9c8f0 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 03c836d9251a..03c836d9251a 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 b81acdaa499e..b81acdaa499e 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 fb034a471e7c..fb034a471e7c 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 8c3faf1ff402..8c3faf1ff402 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 284773fe660f..284773fe660f 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 07ce9347cf70..07ce9347cf70 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.nix b/nixpkgs/pkgs/development/interpreters/love/0.7.nix
index 884225b6483e..884225b6483e 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 5fbb34bf213a..5fbb34bf213a 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 425239af2242..425239af2242 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 7adaca7b8656..7adaca7b8656 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.0004-Fix-stack-overflow-in-vararg-functions.patch b/nixpkgs/pkgs/development/interpreters/lua-5/5.1.0004-Fix-stack-overflow-in-vararg-functions.patch
index 31d3b8bdee76..31d3b8bdee76 100644
--- a/pkgs/development/interpreters/lua-5/5.1.0004-Fix-stack-overflow-in-vararg-functions.patch
+++ b/nixpkgs/pkgs/development/interpreters/lua-5/5.1.0004-Fix-stack-overflow-in-vararg-functions.patch
diff --git a/pkgs/development/interpreters/lua-5/5.1.darwin.patch b/nixpkgs/pkgs/development/interpreters/lua-5/5.1.darwin.patch
index b7754da79baf..b7754da79baf 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 be0e206bbfc7..be0e206bbfc7 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/build-lua-package.nix b/nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix
index 74ccb91030aa..74ccb91030aa 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/build-rocks.nix b/nixpkgs/pkgs/development/interpreters/lua-5/build-rocks.nix
index e69de29bb2d1..e69de29bb2d1 100644
--- a/pkgs/development/interpreters/lua-5/build-rocks.nix
+++ b/nixpkgs/pkgs/development/interpreters/lua-5/build-rocks.nix
diff --git a/pkgs/development/interpreters/lua-5/build-rockspec.nix b/nixpkgs/pkgs/development/interpreters/lua-5/build-rockspec.nix
index e69de29bb2d1..e69de29bb2d1 100644
--- a/pkgs/development/interpreters/lua-5/build-rockspec.nix
+++ b/nixpkgs/pkgs/development/interpreters/lua-5/build-rockspec.nix
diff --git a/pkgs/development/interpreters/lua-5/default.nix b/nixpkgs/pkgs/development/interpreters/lua-5/default.nix
index 08645dfb77f3..08645dfb77f3 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 7aa41e95cc9b..7aa41e95cc9b 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 26db917c9002..26db917c9002 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 c70dbc4f9cc2..c70dbc4f9cc2 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 62caffd8d8a0..62caffd8d8a0 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 3989bedffdb1..3989bedffdb1 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 d8a789e9209e..d8a789e9209e 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 0e0fbd397358..0e0fbd397358 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 f00e0d5ac336..f00e0d5ac336 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 545a0ae271c4..545a0ae271c4 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 14bd4a416468..14bd4a416468 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 c3f88f451e8d..c3f88f451e8d 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 0889b7fefe68..0889b7fefe68 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 e8f1b8b338c4..e8f1b8b338c4 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 7db8feb98e71..7db8feb98e71 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 5a241fbf83ee..5a241fbf83ee 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 8a8b08fcd68a..8a8b08fcd68a 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 30013946886b..30013946886b 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 e8e23cee830a..e8e23cee830a 100644
--- a/pkgs/development/interpreters/metamath/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/metamath/default.nix
diff --git a/pkgs/development/interpreters/mujs/default.nix b/nixpkgs/pkgs/development/interpreters/mujs/default.nix
index f071aab94c78..f071aab94c78 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 277993339e23..277993339e23 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 d3dda7655c2e..d3dda7655c2e 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 a34834af48cb..a34834af48cb 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 40626c51f9bd..40626c51f9bd 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 231853fe51a6..231853fe51a6 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 3bcedc47c4bd..3bcedc47c4bd 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 9f92368df687..9f92368df687 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 ad65d1339f36..ad65d1339f36 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 0ccf6254b782..0ccf6254b782 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/setup-hook-cross.sh b/nixpkgs/pkgs/development/interpreters/perl/setup-hook-cross.sh
index 95aae0b2670f..95aae0b2670f 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 7909412806c8..7909412806c8 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 9d4cd75486e6..9d4cd75486e6 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 95122aebf039..95122aebf039 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 ea314789ce78..ea314789ce78 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 908f06ec49ab..908f06ec49ab 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 ea2e3e28f2cc..ea2e3e28f2cc 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 7f784e0f5a95..7f784e0f5a95 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 62ab7b02585e..62ab7b02585e 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 01cffe93024f..01cffe93024f 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 d1f2edce936d..d1f2edce936d 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 4a7f3423defd..4a7f3423defd 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 a36d280c5867..a36d280c5867 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 122ab6e2c07b..122ab6e2c07b 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 5710f1066757..5710f1066757 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 188058a73b52..188058a73b52 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 009f9b48ea4e..009f9b48ea4e 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 d79cd58c1598..d79cd58c1598 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/build-python-package-common.nix b/nixpkgs/pkgs/development/interpreters/python/build-python-package-common.nix
index 0f8e088d434a..0f8e088d434a 100644
--- a/pkgs/development/interpreters/python/build-python-package-common.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/build-python-package-common.nix
diff --git a/pkgs/development/interpreters/python/build-python-package-flit.nix b/nixpkgs/pkgs/development/interpreters/python/build-python-package-flit.nix
index b0f9e0380211..b0f9e0380211 100644
--- a/pkgs/development/interpreters/python/build-python-package-flit.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/build-python-package-flit.nix
diff --git a/pkgs/development/interpreters/python/build-python-package-pyproject.nix b/nixpkgs/pkgs/development/interpreters/python/build-python-package-pyproject.nix
index 86c450fcf92c..86c450fcf92c 100644
--- a/pkgs/development/interpreters/python/build-python-package-pyproject.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/build-python-package-pyproject.nix
diff --git a/pkgs/development/interpreters/python/build-python-package-setuptools.nix b/nixpkgs/pkgs/development/interpreters/python/build-python-package-setuptools.nix
index 4c66fdec5f6b..4c66fdec5f6b 100644
--- a/pkgs/development/interpreters/python/build-python-package-setuptools.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/build-python-package-setuptools.nix
diff --git a/pkgs/development/interpreters/python/build-python-package-wheel.nix b/nixpkgs/pkgs/development/interpreters/python/build-python-package-wheel.nix
index e3c4e13c0e2d..e3c4e13c0e2d 100644
--- a/pkgs/development/interpreters/python/build-python-package-wheel.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/build-python-package-wheel.nix
diff --git a/pkgs/development/interpreters/python/build-python-package.nix b/nixpkgs/pkgs/development/interpreters/python/build-python-package.nix
index 61c1186cef9e..61c1186cef9e 100644
--- a/pkgs/development/interpreters/python/build-python-package.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/build-python-package.nix
diff --git a/pkgs/development/interpreters/python/catch_conflicts/README.md b/nixpkgs/pkgs/development/interpreters/python/catch_conflicts/README.md
index d144b80e3385..d144b80e3385 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 bb82900c65a9..bb82900c65a9 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 22bc0f7ced0a..22bc0f7ced0a 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 28b6dafc3f15..28b6dafc3f15 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 bef137efda7b..bef137efda7b 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 d1dae8c47dc1..d1dae8c47dc1 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 ea696978236a..ea696978236a 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 e1cf5ad4bbf9..e1cf5ad4bbf9 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 bfaeb37c287d..bfaeb37c287d 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 6e1fc8b53e83..6e1fc8b53e83 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 68f6921ba6aa..68f6921ba6aa 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 55281db6768f..55281db6768f 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 56c75cbdeeaf..56c75cbdeeaf 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/boot.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/boot.nix
index 9e38e8250748..9e38e8250748 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/boot.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/boot.nix
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 c83b56437a49..c83b56437a49 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 1503c221bdd4..1503c221bdd4 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 98d9d339fa11..98d9d339fa11 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 83f3fea1931b..83f3fea1931b 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 2a6b2a20dd19..2a6b2a20dd19 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 90c21d5e60ca..90c21d5e60ca 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 2e7b7526c0ce..2e7b7526c0ce 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 b73f62b97ec5..b73f62b97ec5 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 c263cdbff4db..c263cdbff4db 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 013c2d266eff..013c2d266eff 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 9718b1d8dceb..9718b1d8dceb 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 01356020b394..01356020b394 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 b73f62b97ec5..b73f62b97ec5 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 0f829860a5b7..0f829860a5b7 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 b73f62b97ec5..b73f62b97ec5 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 a1f9d68eb166..a1f9d68eb166 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 ceb6047d31dd..ceb6047d31dd 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 a1f9d68eb166..a1f9d68eb166 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/default.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix
index 5eb7f3ec1661..5eb7f3ec1661 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 73d1e0ea9fd7..73d1e0ea9fd7 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 54c0954ae5d0..54c0954ae5d0 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 059908029c0b..059908029c0b 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 53c5aa3b629b..53c5aa3b629b 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 5a6dcc63225e..5a6dcc63225e 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 a122d7519f5d..a122d7519f5d 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 4473f2e351c4..4473f2e351c4 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 d9d21bfe3a57..d9d21bfe3a57 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 a538f731473b..a538f731473b 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 a4b2e0893fcd..a4b2e0893fcd 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 4a0c84fb272e..4a0c84fb272e 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 7f21d03fc3a5..7f21d03fc3a5 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 e60c9df1f8bb..e60c9df1f8bb 100644
--- a/pkgs/development/interpreters/python/fetchpypi.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/fetchpypi.nix
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix
index 6a9e3d48bdb5..6a9e3d48bdb5 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 42b652978bcc..42b652978bcc 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 6af198e65ead..6af198e65ead 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 92bbfc557b35..92bbfc557b35 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 e3a530eb0cb6..e3a530eb0cb6 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 b66bd1cc5f69..b66bd1cc5f69 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 523df5762fad..523df5762fad 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/update-python-libraries/default.nix b/nixpkgs/pkgs/development/interpreters/python/update-python-libraries/default.nix
index 762ca2bdd34b..762ca2bdd34b 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 9292a9307030..9292a9307030 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 e1de0b2ee4ca..e1de0b2ee4ca 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 6a19a2152419..6a19a2152419 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 c7201c7a997b..c7201c7a997b 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 5a2ec567b9eb..5a2ec567b9eb 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 779039c6d6aa..779039c6d6aa 100644
--- a/pkgs/development/interpreters/qnial/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/qnial/default.nix
diff --git a/pkgs/development/interpreters/racket/default.nix b/nixpkgs/pkgs/development/interpreters/racket/default.nix
index e37c43a0bd65..e37c43a0bd65 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 a3d4a7a3c4fd..a3d4a7a3c4fd 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 1244ad5ecd2e..1244ad5ecd2e 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 22eee0f6ead8..22eee0f6ead8 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 4d98f18eee4a..4d98f18eee4a 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 56ff02831741..56ff02831741 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 1d67193a73cf..1d67193a73cf 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 481d9848f830..481d9848f830 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 d97d2295341a..d97d2295341a 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 85a6c6439b9c..85a6c6439b9c 100644
--- a/pkgs/development/interpreters/renpy/launcherenv.patch
+++ b/nixpkgs/pkgs/development/interpreters/renpy/launcherenv.patch
diff --git a/nixpkgs/pkgs/development/interpreters/ruby/bitperfect-rdoc.patch b/nixpkgs/pkgs/development/interpreters/ruby/bitperfect-rdoc.patch
new file mode 100644
index 000000000000..d5fb9e4554fa
--- /dev/null
+++ b/nixpkgs/pkgs/development/interpreters/ruby/bitperfect-rdoc.patch
@@ -0,0 +1,13 @@
+diff -r -u orig/lib/rdoc/generator/template/darkfish/filepage.rhtml new/lib/rdoc/generator/template/darkfish/filepage.rhtml
+--- orig/lib/rdoc/generator/template/darkfish/filepage.rhtml
++++ new/lib/rdoc/generator/template/darkfish/filepage.rhtml
+@@ -88,9 +88,6 @@
+ <body class="file file-popup">
+   <div id="metadata">
+     <dl>
+-      <dt class="modified-date">Last Modified</dt>
+-      <dd class="modified-date"><%= file.last_modified %></dd>
+-
+       <% if file.requires %>
+       <dt class="requires">Requires</dt>
+       <dd class="requires">
diff --git a/pkgs/development/interpreters/ruby/config.nix b/nixpkgs/pkgs/development/interpreters/ruby/config.nix
index c4f3160d1602..c4f3160d1602 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 4e617ce67eb9..2c14955b976f 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/ruby/default.nix
@@ -25,15 +25,19 @@ let
   generic = { version, sha256 }: let
     ver = version;
     tag = ver.gitTag;
+    isRuby20 = ver.majMin == "2.0";
+    isRuby21 = ver.majMin == "2.1";
     atLeast25 = lib.versionAtLeast ver.majMin "2.5";
     baseruby = self.override {
       useRailsExpress = false;
       docSupport = false;
+      rubygemsSupport = false;
     };
     self = lib.makeOverridable (
       { stdenv, buildPackages, lib
       , fetchurl, fetchFromSavannah, fetchFromGitHub
       , useRailsExpress ? true
+      , rubygemsSupport ? true
       , zlib, zlibSupport ? true
       , openssl, opensslSupport ? true
       , gdbm, gdbmSupport ? true
@@ -83,17 +87,28 @@ let
 
         enableParallelBuilding = true;
 
+        hardeningDisable = lib.optional isRuby20 "format";
+
         patches =
           (import ./patchsets.nix {
             inherit patchSet useRailsExpress ops;
             patchLevel = ver.patchLevel;
           })."${ver.majMinTiny}";
 
-        postUnpack = ''
-          cp -r ${rubygems} $sourceRoot/rubygems
+        postUnpack = opString rubygemsSupport ''
+          rm -rf $sourceRoot/{lib,test}/rubygems*
+          cp -r ${rubygems}/lib/rubygems* $sourceRoot/lib
+          cp -r ${rubygems}/test/rubygems $sourceRoot/test
+        '' + opString isRuby21 ''
+          rm "$sourceRoot/enc/unicode/name2ctype.h"
         '';
 
-        postPatch = if atLeast25 then ''
+        postPatch = if isRuby21 then ''
+          rm tool/config_files.rb
+          cp ${config}/config.guess tool/
+          cp ${config}/config.sub tool/
+        ''
+        else if atLeast25 then ''
           sed -i configure.ac -e '/config.guess/d'
           cp --remove-destination ${config}/config.guess tool/
           cp --remove-destination ${config}/config.sub tool/
@@ -135,12 +150,6 @@ let
         installFlags = stdenv.lib.optionalString docSupport "install-doc";
         # Bundler tries to create this directory
         postInstall = ''
-          # Update rubygems
-          pushd rubygems
-          chmod +w bundler/bundler.gemspec
-          ${buildRuby} setup.rb --destdir $GEM_HOME
-          popd
-
           # Remove unnecessary groff reference from runtime closure, since it's big
           sed -i '/NROFF/d' $out/lib/ruby/*/*/rbconfig.rb
 
@@ -204,6 +213,38 @@ let
     ) args; in self;
 
 in {
+  ruby_1_9 = generic {
+    version = rubyVersion "1" "9" "3" "p551";
+    sha256 = {
+      src = "1s2ibg3s2iflzdv7rfxi1qqkvdbn2dq8gxdn0nxrb77ls5ffanxv";
+      git = "1r9xzzxmci2ajb34qb4y1w424mz878zdgzxkfp9w60agldxnb36s";
+    };
+  };
+
+  ruby_2_0 = generic {
+    version = rubyVersion "2" "0" "0" "p648";
+    sha256 = {
+      src = "1y3n4c6xw2wki7pyjpq5zpbgxnw5i3jc8mcpj6rk7hs995mvv446";
+      git = "0ncjfq4hfqj9kcr8pbll6kypwnmcgs8w7l4466qqfyv7jj3yjd76";
+    };
+  };
+
+  ruby_2_1 = generic {
+    version = rubyVersion "2" "1" "10" "";
+    sha256 = {
+      src = "086x66w51lg41abjn79xb7f6xsryymkcc3nvakmkjnjyg96labpv";
+      git = "133phd5r5y0np5lc9nqif93l7yb13yd52aspyl6c46z5jhvhyvfi";
+    };
+  };
+
+  ruby_2_2 = generic {
+    version = rubyVersion "2" "2" "9" "";
+    sha256 = {
+      src = "19m1ximl7vcrsvq595dgrjh4yb6kar944095wbywqh7waiqcfirg";
+      git = "03qrjh55098wcqh2khxryzkzfqkznjrcdgwf27r2bgcycbg5ca5q";
+    };
+  };
+
   ruby_2_3 = generic {
     version = rubyVersion "2" "3" "8" "";
     sha256 = {
diff --git a/pkgs/development/interpreters/ruby/dev.nix b/nixpkgs/pkgs/development/interpreters/ruby/dev.nix
index 62d561fbc142..62d561fbc142 100644
--- a/pkgs/development/interpreters/ruby/dev.nix
+++ b/nixpkgs/pkgs/development/interpreters/ruby/dev.nix
diff --git a/nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix b/nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix
new file mode 100644
index 000000000000..8cfc3385b061
--- /dev/null
+++ b/nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix
@@ -0,0 +1,78 @@
+{ patchSet, useRailsExpress, ops, patchLevel }:
+
+rec {
+  "1.9.3" = [
+    ./ssl_v3.patch
+    ./rand-egd.patch
+    ./ruby19-parallel-install.patch
+    ./bitperfect-rdoc.patch
+  ] ++ ops useRailsExpress [
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/01-fix-make-clean.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/02-zero-broken-tests.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/03-railsbench-gc.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/04-display-more-detailed-stack-trace.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/05-fork-support-for-gc-logging.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/06-track-live-dataset-size.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/07-webrick_204_304_keep_alive_fix.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/08-export-a-few-more-symbols-for-ruby-prof.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/09-thread-variables.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/10-faster-loading.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/11-falcon-st-opt.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/12-falcon-sparse-array.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/13-falcon-array-queue.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/14-railsbench-gc-fixes.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/15-show-full-backtrace-on-stack-overflow.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/16-configurable-fiber-stack-sizes.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/17-backport-psych-20.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/18-fix-missing-c-return-event.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/19-fix-process-daemon-call.patch"
+  ];
+  "2.0.0" = [
+    ./ssl_v3.patch
+    ./rand-egd.patch
+  ] ++ ops useRailsExpress [
+    "${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/01-zero-broken-tests.patch"
+    "${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/02-railsexpress-gc.patch"
+    "${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/03-display-more-detailed-stack-trace.patch"
+    "${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/04-show-full-backtrace-on-stack-overflow.patch"
+  ];
+  "2.1.10" = [
+    ./rand-egd.patch
+  ] ++ ops useRailsExpress [
+    # 2.1.10 patchsets are not available, but 2.1.8 patchsets apply
+    "${patchSet}/patches/ruby/2.1.8/railsexpress/01-zero-broken-tests.patch"
+    "${patchSet}/patches/ruby/2.1.8/railsexpress/02-improve-gc-stats.patch"
+    "${patchSet}/patches/ruby/2.1.8/railsexpress/03-display-more-detailed-stack-trace.patch"
+    "${patchSet}/patches/ruby/2.1.8/railsexpress/04-show-full-backtrace-on-stack-overflow.patch"
+    "${patchSet}/patches/ruby/2.1.8/railsexpress/05-funny-falcon-stc-density.patch"
+    "${patchSet}/patches/ruby/2.1.8/railsexpress/06-funny-falcon-stc-pool-allocation.patch"
+    "${patchSet}/patches/ruby/2.1.8/railsexpress/07-aman-opt-aset-aref-str.patch"
+    "${patchSet}/patches/ruby/2.1.8/railsexpress/08-funny-falcon-method-cache.patch"
+    "${patchSet}/patches/ruby/2.1.8/railsexpress/09-heap-dump-support.patch"
+  ];
+  "2.2.9" = ops useRailsExpress [
+    "${patchSet}/patches/ruby/2.2/head/railsexpress/01-zero-broken-tests.patch"
+    "${patchSet}/patches/ruby/2.2/head/railsexpress/02-improve-gc-stats.patch"
+    "${patchSet}/patches/ruby/2.2/head/railsexpress/03-display-more-detailed-stack-trace.patch"
+  ];
+  "2.3.8" = ops useRailsExpress [
+    "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch"
+    "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch"
+    "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch"
+  ];
+  "2.4.5" = ops useRailsExpress [
+    "${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch"
+    "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch"
+    "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch"
+  ];
+  "2.5.5" = ops useRailsExpress [
+    "${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
+    "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch"
+    "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch"
+  ];
+  "2.6.3" = ops useRailsExpress [
+    "${patchSet}/patches/ruby/2.6/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
+    "${patchSet}/patches/ruby/2.6/head/railsexpress/02-improve-gc-stats.patch"
+    "${patchSet}/patches/ruby/2.6/head/railsexpress/03-more-detailed-stacktrace.patch"
+  ];
+}
diff --git a/nixpkgs/pkgs/development/interpreters/ruby/rand-egd.patch b/nixpkgs/pkgs/development/interpreters/ruby/rand-egd.patch
new file mode 100644
index 000000000000..e4f6452000c2
--- /dev/null
+++ b/nixpkgs/pkgs/development/interpreters/ruby/rand-egd.patch
@@ -0,0 +1,42 @@
+diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb
+index e272cba..3a1fa71 100644
+--- a/ext/openssl/extconf.rb
++++ b/ext/openssl/extconf.rb
+@@ -87,6 +87,7 @@
+ have_func("PEM_def_callback")
+ have_func("PKCS5_PBKDF2_HMAC")
+ have_func("PKCS5_PBKDF2_HMAC_SHA1")
++have_func("RAND_egd")
+ have_func("X509V3_set_nconf")
+ have_func("X509V3_EXT_nconf_nid")
+ have_func("X509_CRL_add0_revoked")
+diff --git a/ext/openssl/ossl_rand.c b/ext/openssl/ossl_rand.c
+index 29cbf8c..27466fe 100644
+--- a/ext/openssl/ossl_rand.c
++++ b/ext/openssl/ossl_rand.c
+@@ -148,6 +148,7 @@ ossl_rand_pseudo_bytes(VALUE self, VALUE len)
+     return str;
+ }
+ 
++#ifdef HAVE_RAND_EGD
+ /*
+  *  call-seq:
+  *     egd(filename) -> true
+@@ -186,6 +187,7 @@ ossl_rand_egd_bytes(VALUE self, VALUE filename, VALUE len)
+     }
+     return Qtrue;
+ }
++#endif /* HAVE_RAND_EGD */
+ 
+ /*
+  *  call-seq:
+@@ -219,7 +221,9 @@ Init_ossl_rand(void)
+     DEFMETH(mRandom, "write_random_file", ossl_rand_write_file, 1);
+     DEFMETH(mRandom, "random_bytes", ossl_rand_bytes, 1);
+     DEFMETH(mRandom, "pseudo_bytes", ossl_rand_pseudo_bytes, 1);
++#ifdef HAVE_RAND_EGD
+     DEFMETH(mRandom, "egd", ossl_rand_egd, 1);
+     DEFMETH(mRandom, "egd_bytes", ossl_rand_egd_bytes, 2);
++#endif /* HAVE_RAND_EGD */
+     DEFMETH(mRandom, "status?", ossl_rand_status, 0)
+ }
diff --git a/pkgs/development/interpreters/ruby/rbconfig.rb b/nixpkgs/pkgs/development/interpreters/ruby/rbconfig.rb
index eeba930b54b7..eeba930b54b7 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 b1cbbfc216dc..b1cbbfc216dc 100644
--- a/pkgs/development/interpreters/ruby/ruby-version.nix
+++ b/nixpkgs/pkgs/development/interpreters/ruby/ruby-version.nix
diff --git a/nixpkgs/pkgs/development/interpreters/ruby/ruby19-parallel-install.patch b/nixpkgs/pkgs/development/interpreters/ruby/ruby19-parallel-install.patch
new file mode 100644
index 000000000000..bb8063508732
--- /dev/null
+++ b/nixpkgs/pkgs/development/interpreters/ruby/ruby19-parallel-install.patch
@@ -0,0 +1,15 @@
+Index: ruby-1.9.3-p392/lib/mkmf.rb
+===================================================================
+--- ruby-1.9.3-p392.orig/lib/mkmf.rb
++++ ruby-1.9.3-p392/lib/mkmf.rb
+@@ -2039,8 +2039,8 @@ static: $(STATIC_LIB)#{$extout ? " insta
+       end
+       for f in files
+         dest = "#{dir}/#{File.basename(f)}"
+-        mfile.print("install-rb#{sfx}: #{dest} #{dir}\n")
+-        mfile.print("#{dest}: #{f}\n")
++        mfile.print("install-rb#{sfx}: #{dest}\n")
++        mfile.print("#{dest}: #{f} #{timestamp_file(dir)}\n")
+         mfile.print("\t$(Q) $(#{$extout ? 'COPY' : 'INSTALL_DATA'}) #{f} $(@D#{sep})\n")
+         if defined?($installed_list) and !$extout
+           mfile.print("\t@echo #{dest}>>$(INSTALLED_LIST)\n")
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 84d1d52409e5..84d1d52409e5 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 d6eba67e1065..d6eba67e1065 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 138d432c8203..138d432c8203 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 b9548284355d..b9548284355d 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 95b38fc8ebd5..95b38fc8ebd5 100644
--- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix
+++ b/nixpkgs/pkgs/development/interpreters/ruby/rvm-patchsets.nix
diff --git a/nixpkgs/pkgs/development/interpreters/ruby/ssl_v3.patch b/nixpkgs/pkgs/development/interpreters/ruby/ssl_v3.patch
new file mode 100644
index 000000000000..faa402165751
--- /dev/null
+++ b/nixpkgs/pkgs/development/interpreters/ruby/ssl_v3.patch
@@ -0,0 +1,16 @@
+--- a/ext/openssl/ossl_ssl.c  2015-11-26 16:41:03.775058140 +0000
++++ b/ext/openssl/ossl_ssl.c  2015-11-26 16:40:56.191907346 +0000
+@@ -138,9 +138,12 @@
+     OSSL_SSL_METHOD_ENTRY(SSLv2_server),
+     OSSL_SSL_METHOD_ENTRY(SSLv2_client),
+ #endif
++#if defined(HAVE_SSLV3_METHOD) && defined(HAVE_SSLV3_SERVER_METHOD) && \
++        defined(HAVE_SSLV3_CLIENT_METHOD)
+     OSSL_SSL_METHOD_ENTRY(SSLv3),
+     OSSL_SSL_METHOD_ENTRY(SSLv3_server),
+     OSSL_SSL_METHOD_ENTRY(SSLv3_client),
++#endif
+     OSSL_SSL_METHOD_ENTRY(SSLv23),
+     OSSL_SSL_METHOD_ENTRY(SSLv23_server),
+     OSSL_SSL_METHOD_ENTRY(SSLv23_client),
+
diff --git a/pkgs/development/interpreters/scheme48/default.nix b/nixpkgs/pkgs/development/interpreters/scheme48/default.nix
index e01aef98303c..e01aef98303c 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 85c9434f0813..85c9434f0813 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 594bbc05b7ce..594bbc05b7ce 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 d504682086b0..d504682086b0 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 721aff154e37..721aff154e37 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 f6dab5497a0a..f6dab5497a0a 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 9c81b230ada2..9c81b230ada2 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 d48cf841b048..d48cf841b048 100644
--- a/pkgs/development/interpreters/spidermonkey/38.nix
+++ b/nixpkgs/pkgs/development/interpreters/spidermonkey/38.nix
diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/nixpkgs/pkgs/development/interpreters/spidermonkey/52.nix
index 2ec5923b0e1f..2ec5923b0e1f 100644
--- a/pkgs/development/interpreters/spidermonkey/52.nix
+++ b/nixpkgs/pkgs/development/interpreters/spidermonkey/52.nix
diff --git a/pkgs/development/interpreters/spidermonkey/60.nix b/nixpkgs/pkgs/development/interpreters/spidermonkey/60.nix
index 1dfaf9a22860..1dfaf9a22860 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 057375182f53..057375182f53 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 193ff4f93769..193ff4f93769 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 d76ceb3421de..d76ceb3421de 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 cd377e70cd9c..cd377e70cd9c 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 f2c5fd938cec..f2c5fd938cec 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 77154b54fd8f..77154b54fd8f 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 ac291668e2d9..ac291668e2d9 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 3144dd898374..3144dd898374 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/wasmtime/cargo-lock.patch b/nixpkgs/pkgs/development/interpreters/wasmtime/cargo-lock.patch
index be5bd0ab3d3e..be5bd0ab3d3e 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 33d00afd9e70..33d00afd9e70 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 e6a2b0cae99d..e6a2b0cae99d 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 b4a6aa68f448..b4a6aa68f448 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 050d511b0a10..050d511b0a10 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 70ce940ccf17..70ce940ccf17 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 a2d71e9db0c8..a2d71e9db0c8 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 63f68b925430..63f68b925430 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 47750abe4623..47750abe4623 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 f0614ec99e36..f0614ec99e36 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 41756bb80d50..41756bb80d50 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 a7196c6e0314..a7196c6e0314 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 f8bbc07f1025..f8bbc07f1025 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 39b274b5030a..39b274b5030a 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 60aac560b9b2..60aac560b9b2 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 2e842410aafb..2e842410aafb 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 ec874c73e365..ec874c73e365 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 bab9e1b115d0..bab9e1b115d0 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 3842b8c5afa0..3842b8c5afa0 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 36c4af5f4961..36c4af5f4961 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 a7bfa545908a..a7bfa545908a 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 a8b1ea9f0217..a8b1ea9f0217 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 7ebe655580e5..7ebe655580e5 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 f3d5fb3e9342..f3d5fb3e9342 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 f63c91cd360a..f63c91cd360a 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 14c5a99d42ff..14c5a99d42ff 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 0796d0665103..0796d0665103 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 bb0e578d5d63..bb0e578d5d63 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 948dbc3baf6c..948dbc3baf6c 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 5b45f89e9d54..5b45f89e9d54 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 00d089ea249b..00d089ea249b 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 9fa1051cd80b..9fa1051cd80b 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 014f678bc149..014f678bc149 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 80cbf993a60d..80cbf993a60d 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 963d6c6b646d..963d6c6b646d 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 2ae3bfe6034c..2ae3bfe6034c 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 ce6c7c176941..ce6c7c176941 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 f852cc957a56..f852cc957a56 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 be9642b0e206..be9642b0e206 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 dbdc09a46734..dbdc09a46734 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 9e11c0f40829..9e11c0f40829 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 f0074ef816ed..f0074ef816ed 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 a65f19620485..a65f19620485 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 6940fafae821..6940fafae821 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 0b07d8b8679b..0b07d8b8679b 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 8a508cf15053..8a508cf15053 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 443a1acd4513..443a1acd4513 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 6b42082cfd8a..6b42082cfd8a 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 67c44986d0a0..67c44986d0a0 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 b3cfc9280914..b3cfc9280914 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 c1f7fcc3f76c..c1f7fcc3f76c 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 b62aa86bf45c..b62aa86bf45c 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 bc0573f6b706..bc0573f6b706 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 1374080d0874..1374080d0874 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 864d3b98f7ba..864d3b98f7ba 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 8cc79dc1d228..8cc79dc1d228 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 dd9b1d1b0aa5..dd9b1d1b0aa5 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 245daa5fdb90..245daa5fdb90 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 08d18745ed7f..08d18745ed7f 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 384b92859762..384b92859762 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 c417c955b69b..c417c955b69b 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 6ff1755e8f53..6ff1755e8f53 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 11baab0950d0..11baab0950d0 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 a42064a0e9e8..a42064a0e9e8 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 f7221a96627f..f7221a96627f 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 fd3fc80e7e05..fd3fc80e7e05 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 375a1913afcd..375a1913afcd 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 be2013a26760..be2013a26760 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 5b34cde0503c..5b34cde0503c 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 8ada106f48fd..8ada106f48fd 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 90ff3de6a3fe..90ff3de6a3fe 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 eee41f5ed2fd..eee41f5ed2fd 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 ce0537cea7d8..ce0537cea7d8 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 610f98a7e466..610f98a7e466 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 c67d72705482..c67d72705482 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 51a004ed5451..51a004ed5451 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 bca16ccd114c..bca16ccd114c 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 0a181dc1a1ec..0a181dc1a1ec 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 11295b3128fd..11295b3128fd 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 a96e3670b401..a96e3670b401 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 fcb708c829be..fcb708c829be 100644
--- a/pkgs/development/libraries/AntTweakBar/default.nix
+++ b/nixpkgs/pkgs/development/libraries/AntTweakBar/default.nix
diff --git a/pkgs/development/libraries/CGAL/default.nix b/nixpkgs/pkgs/development/libraries/CGAL/default.nix
index 95984c970018..95984c970018 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 fbf9615f88a2..fbf9615f88a2 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 9522038df6af..9522038df6af 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 bfee99619840..bfee99619840 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 f7703b731b99..f7703b731b99 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 fd3c6b471453..fd3c6b471453 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 5f75ae9e8301..5f75ae9e8301 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 20382f18f529..20382f18f529 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 a2db9c2349d1..a2db9c2349d1 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 a6114901055a..a6114901055a 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 3acce9d473c5..3acce9d473c5 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 803cc97a8ae8..803cc97a8ae8 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 a2ef54cc136b..a2ef54cc136b 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 61e15d621bcd..61e15d621bcd 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 1cb74ac1b2d3..1cb74ac1b2d3 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 b219922223fb..b219922223fb 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_gfx/default.nix b/nixpkgs/pkgs/development/libraries/SDL_gfx/default.nix
index 68c8c16ed4e8..68c8c16ed4e8 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_image/default.nix b/nixpkgs/pkgs/development/libraries/SDL_image/default.nix
index 961a0a7f5aab..961a0a7f5aab 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 887319062be9..887319062be9 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 f1c5a5462d11..f1c5a5462d11 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 6279bfcb4286..6279bfcb4286 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 0e717c530357..0e717c530357 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 7f276387c834..7f276387c834 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 cf6b53021f79..cf6b53021f79 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 3e496b7e981f..3e496b7e981f 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 5ff5e609723e..5ff5e609723e 100644
--- a/pkgs/development/libraries/a52dec/default.nix
+++ b/nixpkgs/pkgs/development/libraries/a52dec/default.nix
diff --git a/pkgs/development/libraries/aacskeys/default.nix b/nixpkgs/pkgs/development/libraries/aacskeys/default.nix
index 9e28bfd4fe2c..9e28bfd4fe2c 100644
--- a/pkgs/development/libraries/aacskeys/default.nix
+++ b/nixpkgs/pkgs/development/libraries/aacskeys/default.nix
diff --git a/pkgs/development/libraries/aalib/darwin.patch b/nixpkgs/pkgs/development/libraries/aalib/darwin.patch
index 44559d06210c..44559d06210c 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 8b1878b0cc30..8b1878b0cc30 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 4e1da8666227..4e1da8666227 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 a50c92924e9a..a50c92924e9a 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 acaccb8c8485..acaccb8c8485 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 8713663ecca7..8713663ecca7 100644
--- a/pkgs/development/libraries/accountsservice/default.nix
+++ b/nixpkgs/pkgs/development/libraries/accountsservice/default.nix
diff --git a/pkgs/development/libraries/accountsservice/fix-paths.patch b/nixpkgs/pkgs/development/libraries/accountsservice/fix-paths.patch
index 0bf6ee3d91a5..0bf6ee3d91a5 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 0333f925d267..0333f925d267 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 e0c46acb6303..e0c46acb6303 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 4b280cc18621..4b280cc18621 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 76e49768d53d..76e49768d53d 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 5170e384f77b..5170e384f77b 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 22e91ee61d7a..22e91ee61d7a 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 6ab7455915cc..6ab7455915cc 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 46743cba3b67..46743cba3b67 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 ac9ce9dd84f4..ac9ce9dd84f4 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 146e44182ed2..146e44182ed2 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 3ab4ed3e9623..3ab4ed3e9623 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 e3dcf765dfd4..e3dcf765dfd4 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 d9350d135eb6..d9350d135eb6 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 6306bb89b5c7..6306bb89b5c7 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 ea232f2853d6..ea232f2853d6 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 2ea20153bbcc..2ea20153bbcc 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 0e4f1da6e140..0e4f1da6e140 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 c0539aeed476..c0539aeed476 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 5c25da920556..5c25da920556 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 f98c8fa480e1..f98c8fa480e1 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 9f8ca69a70f1..9f8ca69a70f1 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 c49ebb550f3f..c49ebb550f3f 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 eca32b740e35..eca32b740e35 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 a227cea1ce7b..a227cea1ce7b 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 95828c44f851..95828c44f851 100644
--- a/pkgs/development/libraries/alure/default.nix
+++ b/nixpkgs/pkgs/development/libraries/alure/default.nix
diff --git a/pkgs/development/libraries/amrnb/default.nix b/nixpkgs/pkgs/development/libraries/amrnb/default.nix
index bfb72be24fe8..bfb72be24fe8 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 15331c22599b..15331c22599b 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 cb22c9ee790b..cb22c9ee790b 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 fc79cae36f83..fc79cae36f83 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 45ad58819c32..45ad58819c32 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 5c6396988a17..5c6396988a17 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 429da8de8350..429da8de8350 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 0013764d7791..0013764d7791 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 87563d6a9cbf..87563d6a9cbf 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 1813c7217810..1813c7217810 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 ea84609868cf..ea84609868cf 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 bbc10fabb268..bbc10fabb268 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 b26291469e75..b26291469e75 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 bb337e471cfc..bb337e471cfc 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 9a0b70e0d97f..9a0b70e0d97f 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 884543d282a7..884543d282a7 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 8929e8bc6eb4..8929e8bc6eb4 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 9d506b10e353..9d506b10e353 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 eb58003a5f63..eb58003a5f63 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 4b8093f74031..4b8093f74031 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 cb0c65e97e3b..cb0c65e97e3b 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 10649092d20d..10649092d20d 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 a1442d141193..a1442d141193 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/arrow-cpp/darwin.patch b/nixpkgs/pkgs/development/libraries/arrow-cpp/darwin.patch
index de9b1986ffed..de9b1986ffed 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 c4cbd970d411..c4cbd970d411 100644
--- a/pkgs/development/libraries/arrow-cpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix
diff --git a/pkgs/development/libraries/asio/1.10.nix b/nixpkgs/pkgs/development/libraries/asio/1.10.nix
index f63fbbd495cb..f63fbbd495cb 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 94fe4c703670..94fe4c703670 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 72305cb633fb..72305cb633fb 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 fd5ccf9696cc..fd5ccf9696cc 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 c4cfa426588c..c4cfa426588c 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 c19827ba93e4..c19827ba93e4 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 5c3c6272f83d..5c3c6272f83d 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 992119faf65e..992119faf65e 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 24e06b0d65a9..24e06b0d65a9 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 6c3f3aa9fa29..6c3f3aa9fa29 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 e5d5313eeb10..e5d5313eeb10 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 0a076442b42c..0a076442b42c 100644
--- a/pkgs/development/libraries/atk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/atk/default.nix
diff --git a/pkgs/development/libraries/atkmm/default.nix b/nixpkgs/pkgs/development/libraries/atkmm/default.nix
index 5338aa683a7c..5338aa683a7c 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 d883100fd3ce..d883100fd3ce 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 497262c04d71..497262c04d71 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 db5ecf3b0169..db5ecf3b0169 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 b79d85bcd7c9..b79d85bcd7c9 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 0e1445ca9ee1..0e1445ca9ee1 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 3a4c363e23c8..3a4c363e23c8 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 ac6f0470a0a8..ac6f0470a0a8 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 0f9f5f5aac68..0f9f5f5aac68 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 fe0e0854a327..fe0e0854a327 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 373d50a0a434..373d50a0a434 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 d026dd258bc7..d026dd258bc7 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/lv2/unstable.nix b/nixpkgs/pkgs/development/libraries/audio/lv2/unstable.nix
index 81cc868f52ca..81cc868f52ca 100644
--- a/pkgs/development/libraries/audio/lv2/unstable.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/lv2/unstable.nix
diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/nixpkgs/pkgs/development/libraries/audio/lvtk/default.nix
index 78763ca29e2a..78763ca29e2a 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 ddd3940098a4..ddd3940098a4 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 51234a415fd7..51234a415fd7 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 2adec665e1c0..2adec665e1c0 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 41bb9ca9f11b..41bb9ca9f11b 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 09a6230184af..09a6230184af 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 10d650d66425..10d650d66425 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 f8b1006d2eb7..f8b1006d2eb7 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 320fc41f76c5..320fc41f76c5 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 4fc5c12ccc4c..4fc5c12ccc4c 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 e9cccab39f02..e9cccab39f02 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 a01aaa14dcee..a01aaa14dcee 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 1ed457aa5fe1..1ed457aa5fe1 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 1a7edd5af9a1..1a7edd5af9a1 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 76010dacc5e2..76010dacc5e2 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 72965c9f0282..72965c9f0282 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 11c66db70752..11c66db70752 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 cbd29a095d45..cbd29a095d45 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 4286eedc87b2..4286eedc87b2 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 ccc4abb85fdb..ccc4abb85fdb 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 0e47398b346d..0e47398b346d 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 7233a187053e..7233a187053e 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 eff6ff626325..eff6ff626325 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 42621a1792cc..42621a1792cc 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 9d5063d8f07d..9d5063d8f07d 100644
--- a/pkgs/development/libraries/bamf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/bamf/default.nix
diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix
index 5439c7657e08..5439c7657e08 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 d7d6ef545163..d7d6ef545163 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 bcdad510e10d..bcdad510e10d 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 05ff5593205a..05ff5593205a 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 093bb811489f..093bb811489f 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 09ca4908d789..09ca4908d789 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 736c9a2f9e0c..736c9a2f9e0c 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 e6702d0db640..e6702d0db640 100644
--- a/pkgs/development/libraries/biblesync/default.nix
+++ b/nixpkgs/pkgs/development/libraries/biblesync/default.nix
diff --git a/pkgs/development/libraries/blitz/blitz-gcc47.patch b/nixpkgs/pkgs/development/libraries/blitz/blitz-gcc47.patch
index d0b35665567b..d0b35665567b 100644
--- a/pkgs/development/libraries/blitz/blitz-gcc47.patch
+++ b/nixpkgs/pkgs/development/libraries/blitz/blitz-gcc47.patch
diff --git a/pkgs/development/libraries/blitz/blitz-testsuite-stencil-et.patch b/nixpkgs/pkgs/development/libraries/blitz/blitz-testsuite-stencil-et.patch
index fcff8685a08d..fcff8685a08d 100644
--- a/pkgs/development/libraries/blitz/blitz-testsuite-stencil-et.patch
+++ b/nixpkgs/pkgs/development/libraries/blitz/blitz-testsuite-stencil-et.patch
diff --git a/pkgs/development/libraries/blitz/default.nix b/nixpkgs/pkgs/development/libraries/blitz/default.nix
index 503e4b0fa43b..503e4b0fa43b 100644
--- a/pkgs/development/libraries/blitz/default.nix
+++ b/nixpkgs/pkgs/development/libraries/blitz/default.nix
diff --git a/pkgs/development/libraries/bobcat/default.nix b/nixpkgs/pkgs/development/libraries/bobcat/default.nix
index 812ad546f866..812ad546f866 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 68f5d7afcf49..c84e0863517a 100644
--- a/pkgs/development/libraries/boehm-gc/7.6.6.nix
+++ b/nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix
@@ -24,10 +24,7 @@ stdenv.mkDerivation rec {
     export NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR"
   '';
 
-  patches = [ (fetchpatch {
-    url = "https://gitweb.gentoo.org/proj/musl.git/plain/dev-libs/boehm-gc/files/boehm-gc-7.6.0-sys_select.patch";
-    sha256 = "1gydwlklvci30f5dpp5ccw2p2qpph5y41r55wx9idamjlq66fbb3";
-  }) ] ++
+  patches =
     # https://github.com/ivmai/bdwgc/pull/208
     lib.optional stdenv.hostPlatform.isRiscV ./riscv.patch;
 
diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix
index a241b42e1878..a241b42e1878 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/riscv.patch b/nixpkgs/pkgs/development/libraries/boehm-gc/riscv.patch
index 249137d0a0dc..249137d0a0dc 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 9ec27d3e9ebc..9ec27d3e9ebc 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 b90006a5e979..b90006a5e979 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 0a38f35af753..0a38f35af753 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 f4931dfe5474..f4931dfe5474 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 b6d74234f799..b6d74234f799 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 871ef392c1ae..871ef392c1ae 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 c4749bc3ee41..c4749bc3ee41 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 1cf9bfa51f4b..1cf9bfa51f4b 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 9837e1c69193..9837e1c69193 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 b44c1a3823a9..b44c1a3823a9 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 406e63b9622b..406e63b9622b 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 cd980439b710..cd980439b710 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 959fa851fe22..959fa851fe22 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 5f7b39c1189e..5f7b39c1189e 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/clang-math-2.patch b/nixpkgs/pkgs/development/libraries/boost/clang-math-2.patch
index f819e9bec623..f819e9bec623 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 aa3d76af28b2..aa3d76af28b2 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 f8163f6d2718..f8163f6d2718 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 73e0910336a1..73e0910336a1 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 2b2713590ca7..2b2713590ca7 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 f7bd189022f8..f7bd189022f8 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 3c27281571af..3c27281571af 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 ee62d5423a15..ee62d5423a15 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 91f7f6647304..91f7f6647304 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 74eb1a2ca83f..74eb1a2ca83f 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 04652aa013aa..04652aa013aa 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 43f6a3b268ee..43f6a3b268ee 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 2580b959bf2a..2580b959bf2a 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 102e7bfcc12b..102e7bfcc12b 100644
--- a/pkgs/development/libraries/box2d/default.nix
+++ b/nixpkgs/pkgs/development/libraries/box2d/default.nix
diff --git a/pkgs/development/libraries/brigand/default.nix b/nixpkgs/pkgs/development/libraries/brigand/default.nix
index b4a57396cc8b..b4a57396cc8b 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 fb25b0a58108..fb25b0a58108 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 2e7efd1c4666..2e7efd1c4666 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 b4a2133f7d8f..b4a2133f7d8f 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 c6c06325dae0..c6c06325dae0 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 12fc1834e905..12fc1834e905 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 b61ac1dcb09f..b61ac1dcb09f 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 1e2bda285a70..1e2bda285a70 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 11b94a0181a1..11b94a0181a1 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 9e38398dfad1..9e38398dfad1 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 3603667fbf21..3603667fbf21 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 15744744067c..15744744067c 100644
--- a/pkgs/development/libraries/caf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/caf/default.nix
diff --git a/nixpkgs/pkgs/development/libraries/cairo/0001-test-don-t-always-build-FreeType-dependent-test.patch b/nixpkgs/pkgs/development/libraries/cairo/0001-test-don-t-always-build-FreeType-dependent-test.patch
new file mode 100644
index 000000000000..9688aca55ab9
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/cairo/0001-test-don-t-always-build-FreeType-dependent-test.patch
@@ -0,0 +1,34 @@
+From 3910b1155f2d5a98142ade67e09f097cb94a2d2e Mon Sep 17 00:00:00 2001
+From: Alyssa Ross <hi@alyssa.is>
+Date: Mon, 22 Apr 2019 09:53:54 +0000
+Subject: [PATCH 1/5] test: don't always build FreeType-dependent test
+
+This caused a build failure when attempting to build cairo without
+FreeType available on the system.
+---
+ test/Makefile.sources | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/Makefile.sources b/test/Makefile.sources
+index c47131faf..cc3d81f7e 100644
+--- a/test/Makefile.sources
++++ b/test/Makefile.sources
+@@ -144,7 +144,6 @@ test_sources = \
+ 	font-face-get-type.c				\
+ 	font-matrix-translation.c			\
+ 	font-options.c					\
+-	font-variations.c				\
+ 	glyph-cache-pressure.c				\
+ 	get-and-set.c					\
+ 	get-clip.c					\
+@@ -399,6 +398,7 @@ pthread_test_sources =					\
+ 
+ ft_font_test_sources = \
+ 	bitmap-font.c \
++	font-variations.c \
+ 	ft-font-create-for-ft-face.c \
+ 	ft-show-glyphs-positioning.c \
+ 	ft-show-glyphs-table.c \
+-- 
+2.19.2
+
diff --git a/nixpkgs/pkgs/development/libraries/cairo/0002-gl-don-t-implicitly-include-X11-headers.patch b/nixpkgs/pkgs/development/libraries/cairo/0002-gl-don-t-implicitly-include-X11-headers.patch
new file mode 100644
index 000000000000..c34e93ae676a
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/cairo/0002-gl-don-t-implicitly-include-X11-headers.patch
@@ -0,0 +1,40 @@
+From ec6ee0e09e2d59455241081af66fb3ba02def7e4 Mon Sep 17 00:00:00 2001
+From: Alyssa Ross <hi@alyssa.is>
+Date: Mon, 22 Apr 2019 10:41:27 +0000
+Subject: [PATCH 2/5] gl: don't implicitly include X11 headers
+
+EGL/egl.h on my system includes X11 headers by default, which breaks
+compilation when they aren't available, even though Cairo doesn't need
+them.
+
+Fortunately, this only happens if MESA_EGL_NO_X11_HEADERS is not
+defined, so defining that allows Cairo to be built with GL enabled even
+when X11 isn't available.
+
+Only when the Xlib surface is enabled are the headers guaranteed to be
+available. In that case, MESA_EGL_NO_X11_HEADERS should not be defined,
+to preserve compatibility with users expecting Cairo to include these
+headers. (There are tests that make this assumption.)
+---
+ src/cairo-gl.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/cairo-gl.h b/src/cairo-gl.h
+index 7cd869c76..a95b07bc3 100644
+--- a/src/cairo-gl.h
++++ b/src/cairo-gl.h
+@@ -127,6 +127,11 @@ cairo_gl_surface_create_for_dc (cairo_device_t		*device,
+ #endif
+ 
+ #if CAIRO_HAS_EGL_FUNCTIONS
++
++#if !CAIRO_HAS_XLIB_SURFACE && !defined(MESA_EGL_NO_X11_HEADERS)
++#define MESA_EGL_NO_X11_HEADERS
++#endif
++
+ #include <EGL/egl.h>
+ 
+ cairo_public cairo_device_t *
+-- 
+2.19.2
+
diff --git a/nixpkgs/pkgs/development/libraries/cairo/0003-test-only-build-GL-tests-when-Xlib-is-enabled.patch b/nixpkgs/pkgs/development/libraries/cairo/0003-test-only-build-GL-tests-when-Xlib-is-enabled.patch
new file mode 100644
index 000000000000..09d7fd88627d
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/cairo/0003-test-only-build-GL-tests-when-Xlib-is-enabled.patch
@@ -0,0 +1,41 @@
+From 84593a7e01b9afa74ec0bddd9515b666d476efba Mon Sep 17 00:00:00 2001
+From: Alyssa Ross <hi@alyssa.is>
+Date: Mon, 22 Apr 2019 11:29:48 +0000
+Subject: [PATCH 3/5] test: only build GL tests when Xlib is enabled
+
+The GL tests all depend on Xlib functions, so they should only be
+enabled when Xlib is enabled, because otherwise the required functions
+might not be present.
+---
+ test/Makefile.am | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/test/Makefile.am b/test/Makefile.am
+index e3c42ea88..9f77622bc 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -16,10 +16,6 @@ test_sources += $(ft_font_test_sources)
+ endif
+ endif
+ 
+-if CAIRO_HAS_GL_SURFACE
+-test_sources += $(gl_surface_test_sources)
+-endif
+-
+ if CAIRO_HAS_EGL_FUNCTIONS
+ test_sources += $(egl_surface_test_sources)
+ endif
+@@ -51,6 +47,10 @@ endif
+ 
+ if CAIRO_HAS_XLIB_SURFACE
+ test_sources += $(xlib_surface_test_sources)
++
++if CAIRO_HAS_GL_SURFACE
++test_sources += $(gl_surface_test_sources)
++endif
+ endif
+ 
+ if CAIRO_HAS_XLIB_XRENDER_SURFACE
+-- 
+2.19.2
+
diff --git a/nixpkgs/pkgs/development/libraries/cairo/0004-util-don-t-build-cairo-sphinx-unless-PNG-enabled.patch b/nixpkgs/pkgs/development/libraries/cairo/0004-util-don-t-build-cairo-sphinx-unless-PNG-enabled.patch
new file mode 100644
index 000000000000..702c4d49e484
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/cairo/0004-util-don-t-build-cairo-sphinx-unless-PNG-enabled.patch
@@ -0,0 +1,32 @@
+From 8b7816ea38a1869e7de94341e3ea9e1eebb8eb4f Mon Sep 17 00:00:00 2001
+From: Alyssa Ross <hi@alyssa.is>
+Date: Mon, 22 Apr 2019 13:08:30 +0000
+Subject: [PATCH 4/5] util: don't build cairo-sphinx unless PNG enabled
+
+cairo-sphinx won't build without libpng, because
+cairo_surface_write_to_png won't be defined.
+---
+ util/Makefile.am | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/util/Makefile.am b/util/Makefile.am
+index 82d0a804c..119b59f48 100644
+--- a/util/Makefile.am
++++ b/util/Makefile.am
+@@ -25,11 +25,13 @@ if BUILD_SPHINX
+ if CAIRO_HAS_DLSYM
+ if CAIRO_HAS_SCRIPT_SURFACE
+ if CAIRO_HAS_TEE_SURFACE
++if CAIRO_HAS_PNG_FUNCTIONS
+ SUBDIRS += cairo-sphinx
+ endif
+ endif
+ endif
+ endif
++endif
+ 
+ AM_CPPFLAGS = -I$(top_srcdir)/src \
+ 	      -I$(top_builddir)/src \
+-- 
+2.19.2
+
diff --git a/pkgs/development/libraries/cairo/default.nix b/nixpkgs/pkgs/development/libraries/cairo/default.nix
index e388b3af5f67..2d6fd1eab964 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cairo/default.nix
@@ -1,25 +1,31 @@
-{ config, stdenv, fetchurl, fetchpatch, pkgconfig, libiconv
-, libintl, expat, zlib, libpng, pixman, fontconfig, freetype
-, x11Support? !stdenv.isDarwin, libXext, libXrender
+{ config, stdenv, lib, fetchurl, fetchpatch, pkgconfig, autoreconfHook
+, pixman
+, zlibSupport ? true, zlib
+, pngSupport ? true, libpng
+, freetypeSupport ? true, freetype
+, fontconfigSupport ? freetypeSupport, fontconfig
 , gobjectSupport ? true, glib
-, xcbSupport ? x11Support, libxcb, xcbutil # no longer experimental since 1.12
+, x11Support ? !stdenv.isDarwin, libX11, libXext
+, x11XrenderSupport ? x11Support, libXrender
+, xcbSupport ? !stdenv.isDarwin, libxcb # no longer experimental since 1.12
 , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
 , glSupport ? config.cairo.gl or (libGLSupported && stdenv.isLinux && !stdenv.isAarch32 && !stdenv.isMips)
 , libGL ? null # libGLU_combined is no longer a big dependency
-, pdfSupport ? true
 , darwin
 }:
 
+assert fontconfigSupport -> freetypeSupport;
+assert x11XrenderSupport -> x11Support;
 assert glSupport -> libGL != null;
 
 let
   version = "1.16.0";
-  inherit (stdenv.lib) optional optionals;
+  inherit (lib) enableFeature optional optionals;
 in stdenv.mkDerivation rec {
   name = "cairo-${version}";
 
   src = fetchurl {
-    url = "https://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${name}.tar.xz";
+    url = "https://cairographics.org/${if lib.mod (builtins.fromJSON (lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${name}.tar.xz";
     sha256 = "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy";
   };
 
@@ -34,28 +40,38 @@ in stdenv.mkDerivation rec {
       url    = "https://gitlab.freedesktop.org/cairo/cairo/commit/6edf572ebb27b00d3c371ba5ae267e39d27d5b6d.patch";
       sha256 = "112hgrrsmcwxh1r52brhi5lksq4pvrz4xhkzcf2iqp55jl2pb7n1";
     })
+
+    ./0001-test-don-t-always-build-FreeType-dependent-test.patch
+    ./0002-gl-don-t-implicitly-include-X11-headers.patch
+    ./0003-test-only-build-GL-tests-when-Xlib-is-enabled.patch
+    ./0004-util-don-t-build-cairo-sphinx-unless-PNG-enabled.patch
   ];
 
   outputs = [ "out" "dev" "devdoc" ];
   outputBin = "dev"; # very small
 
   nativeBuildInputs = [
+    autoreconfHook
     pkgconfig
+    autoreconfHook
   ];
 
-  buildInputs = [
-    libiconv
-    libintl
-  ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+  buildInputs = optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
     CoreGraphics
     CoreText
     ApplicationServices
     Carbon
   ]);
 
-  propagatedBuildInputs = [ fontconfig expat freetype pixman zlib libpng ]
-    ++ optionals x11Support [ libXext libXrender ]
-    ++ optionals xcbSupport [ libxcb xcbutil ]
+  propagatedBuildInputs =
+    [ pixman ]
+    ++ optional zlibSupport zlib
+    ++ optional pngSupport libpng
+    ++ optionals x11Support [ libX11 libXext ]
+    ++ optional x11XrenderSupport libXrender
+    ++ optional xcbSupport libxcb
+    ++ optional freetypeSupport freetype
+    ++ optional fontconfigSupport fontconfig
     ++ optional gobjectSupport glib
     ++ optional glSupport libGL
     ; # TODO: maybe liblzo but what would it be for here?
@@ -66,11 +82,16 @@ in stdenv.mkDerivation rec {
     "--enable-quartz-font"
     "--enable-quartz-image"
     "--enable-ft"
-  ] else ([ "--enable-tee" ]
-    ++ optional xcbSupport "--enable-xcb"
-    ++ optional glSupport "--enable-gl"
-    ++ optional pdfSupport "--enable-pdf"
-  );
+  ] else [
+    (enableFeature zlibSupport "script")
+    (enableFeature zlibSupport "ps")
+    (enableFeature zlibSupport "pdf")
+    (enableFeature zlibSupport "interpreter")
+    (enableFeature pngSupport "png")
+    (enableFeature pngSupport "svg")
+    "--enable-tee"
+    (enableFeature glSupport "gl")
+  ];
 
   preConfigure =
   # On FreeBSD, `-ldl' doesn't exist.
@@ -94,9 +115,9 @@ in stdenv.mkDerivation rec {
 
   doCheck = false; # fails
 
-  postInstall = stdenv.lib.optionalString stdenv.isDarwin glib.flattenInclude;
+  postInstall = lib.optionalString stdenv.isDarwin glib.flattenInclude;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A 2D graphics library with support for multiple output devices";
 
     longDescription = ''
diff --git a/pkgs/development/libraries/cairomm/default.nix b/nixpkgs/pkgs/development/libraries/cairomm/default.nix
index 13550bf3faba..13550bf3faba 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 b175250872f3..b175250872f3 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 c02633d880c4..c02633d880c4 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 d83060fc24d8..d83060fc24d8 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 2d0fd4cb1bcf..2d0fd4cb1bcf 100644
--- a/pkgs/development/libraries/catch2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/catch2/default.nix
diff --git a/pkgs/development/libraries/ccrtp/1.8.nix b/nixpkgs/pkgs/development/libraries/ccrtp/1.8.nix
index db2d177b710c..db2d177b710c 100644
--- a/pkgs/development/libraries/ccrtp/1.8.nix
+++ b/nixpkgs/pkgs/development/libraries/ccrtp/1.8.nix
diff --git a/pkgs/development/libraries/ccrtp/default.nix b/nixpkgs/pkgs/development/libraries/ccrtp/default.nix
index cd9d031788a8..cd9d031788a8 100644
--- a/pkgs/development/libraries/ccrtp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ccrtp/default.nix
diff --git a/pkgs/development/libraries/ccrtp/gcc-4.6-fix.patch b/nixpkgs/pkgs/development/libraries/ccrtp/gcc-4.6-fix.patch
index 49d07a89e52a..49d07a89e52a 100644
--- a/pkgs/development/libraries/ccrtp/gcc-4.6-fix.patch
+++ b/nixpkgs/pkgs/development/libraries/ccrtp/gcc-4.6-fix.patch
diff --git a/pkgs/development/libraries/cctz/default.nix b/nixpkgs/pkgs/development/libraries/cctz/default.nix
index 2930ffa61e3c..2930ffa61e3c 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 68d34c75c010..68d34c75c010 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 4c311f07e017..4c311f07e017 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 af69e23ca1f4..af69e23ca1f4 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 7e5c768036fc..7e5c768036fc 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 e45d74345d44..e45d74345d44 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 a5dd401ec49d..a5dd401ec49d 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 61352d5caf93..61352d5caf93 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 6bf7975034b5..6bf7975034b5 100644
--- a/pkgs/development/libraries/celt/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/celt/generic.nix
diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/nixpkgs/pkgs/development/libraries/ceres-solver/default.nix
index 043b9e263d8a..043b9e263d8a 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-curl-config.patch b/nixpkgs/pkgs/development/libraries/cfitsio/darwin-curl-config.patch
index 77d8f719d778..77d8f719d778 100644
--- a/pkgs/development/libraries/cfitsio/darwin-curl-config.patch
+++ b/nixpkgs/pkgs/development/libraries/cfitsio/darwin-curl-config.patch
diff --git a/pkgs/development/libraries/cfitsio/darwin-rpath-universal.patch b/nixpkgs/pkgs/development/libraries/cfitsio/darwin-rpath-universal.patch
index af38abf329ea..af38abf329ea 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 32308c34ead1..32308c34ead1 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 df75d3a1f1da..df75d3a1f1da 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 ae8b6ca18df3..ae8b6ca18df3 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 f460b69a4f84..f460b69a4f84 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 fbefee48d5b2..fbefee48d5b2 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 02420735ff76..02420735ff76 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 89dd2b443384..89dd2b443384 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 47f419727459..47f419727459 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 3f8de005ff81..3f8de005ff81 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 1890d2b25a0d..1890d2b25a0d 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 d329b1945fc7..d329b1945fc7 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 fd4d8d5ca31b..fd4d8d5ca31b 100644
--- a/pkgs/development/libraries/clearsilver/default.nix
+++ b/nixpkgs/pkgs/development/libraries/clearsilver/default.nix
diff --git a/pkgs/development/libraries/clipper/default.nix b/nixpkgs/pkgs/development/libraries/clipper/default.nix
index 086816655d3b..086816655d3b 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 7764e9c67ed2..7764e9c67ed2 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 47037339d417..47037339d417 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 8440d839411b..8440d839411b 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 fa4e19f716ae..fa4e19f716ae 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 902e0b26687b..902e0b26687b 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 91347813a24f..91347813a24f 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 80e49a8e712e..80e49a8e712e 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 f5f44a7fa2c4..f5f44a7fa2c4 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 899411fe02b4..899411fe02b4 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 8451b0853729..8451b0853729 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 c06413f3c2e1..c06413f3c2e1 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 f78b26d24f6a..f78b26d24f6a 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 9577bfe9e8a2..9577bfe9e8a2 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 d59bc5161af5..d59bc5161af5 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 7095a808540f..7095a808540f 100644
--- a/pkgs/development/libraries/clutter/default.nix
+++ b/nixpkgs/pkgs/development/libraries/clutter/default.nix
diff --git a/pkgs/development/libraries/cmark/default.nix b/nixpkgs/pkgs/development/libraries/cmark/default.nix
index ede2049b6ee9..ede2049b6ee9 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 cb4f3e39aefa..cb4f3e39aefa 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 ae110846ff06..ae110846ff06 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 8044d7165f75..8044d7165f75 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 9f4c4c3b6b36..9f4c4c3b6b36 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 8eacbb4f855f..8eacbb4f855f 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 80b6480323be..80b6480323be 100644
--- a/pkgs/development/libraries/coin3d/default.nix
+++ b/nixpkgs/pkgs/development/libraries/coin3d/default.nix
diff --git a/pkgs/development/libraries/commoncpp2/default.nix b/nixpkgs/pkgs/development/libraries/commoncpp2/default.nix
index 0c5ab7585833..0c5ab7585833 100644
--- a/pkgs/development/libraries/commoncpp2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/commoncpp2/default.nix
diff --git a/pkgs/development/libraries/concurrencykit/default.nix b/nixpkgs/pkgs/development/libraries/concurrencykit/default.nix
index 29ce216cadf1..29ce216cadf1 100644
--- a/pkgs/development/libraries/concurrencykit/default.nix
+++ b/nixpkgs/pkgs/development/libraries/concurrencykit/default.nix
diff --git a/pkgs/development/libraries/coprthr/default.nix b/nixpkgs/pkgs/development/libraries/coprthr/default.nix
index 5630daa0d933..5630daa0d933 100644
--- a/pkgs/development/libraries/coprthr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/coprthr/default.nix
diff --git a/pkgs/development/libraries/coredumper/default.nix b/nixpkgs/pkgs/development/libraries/coredumper/default.nix
index ddd0d87a5511..ddd0d87a5511 100644
--- a/pkgs/development/libraries/coredumper/default.nix
+++ b/nixpkgs/pkgs/development/libraries/coredumper/default.nix
diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/nixpkgs/pkgs/development/libraries/cpp-hocon/default.nix
index c2f3ce9b9b4a..c2f3ce9b9b4a 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 c13b32a67b06..c13b32a67b06 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 badfc630a47e..badfc630a47e 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 cd16dea56b18..cd16dea56b18 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 a2493e55fb0b..a2493e55fb0b 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 3423b29d76c8..3423b29d76c8 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 e663c87f799e..e663c87f799e 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 3f8b2d896ac6..3f8b2d896ac6 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 2dce60d4b2c4..2dce60d4b2c4 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 4c63e93e5c41..4c63e93e5c41 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 ea3f5e6476bc..ea3f5e6476bc 100644
--- a/pkgs/development/libraries/cracklib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cracklib/default.nix
diff --git a/pkgs/development/libraries/cre2/default.nix b/nixpkgs/pkgs/development/libraries/cre2/default.nix
index 74619cbaaaed..74619cbaaaed 100644
--- a/pkgs/development/libraries/cre2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cre2/default.nix
diff --git a/pkgs/development/libraries/croaring/default.nix b/nixpkgs/pkgs/development/libraries/croaring/default.nix
index 6e6ee2479d44..6e6ee2479d44 100644
--- a/pkgs/development/libraries/croaring/default.nix
+++ b/nixpkgs/pkgs/development/libraries/croaring/default.nix
diff --git a/pkgs/development/libraries/crypto++/GNUmakefile-darwin.patch b/nixpkgs/pkgs/development/libraries/crypto++/GNUmakefile-darwin.patch
index 5a6cb3bcafb4..5a6cb3bcafb4 100644
--- a/pkgs/development/libraries/crypto++/GNUmakefile-darwin.patch
+++ b/nixpkgs/pkgs/development/libraries/crypto++/GNUmakefile-darwin.patch
diff --git a/pkgs/development/libraries/crypto++/default.nix b/nixpkgs/pkgs/development/libraries/crypto++/default.nix
index 61a825cd3745..61a825cd3745 100644
--- a/pkgs/development/libraries/crypto++/default.nix
+++ b/nixpkgs/pkgs/development/libraries/crypto++/default.nix
diff --git a/pkgs/development/libraries/crypto++/dll.patch b/nixpkgs/pkgs/development/libraries/crypto++/dll.patch
index 12df1fb9e9e9..12df1fb9e9e9 100644
--- a/pkgs/development/libraries/crypto++/dll.patch
+++ b/nixpkgs/pkgs/development/libraries/crypto++/dll.patch
diff --git a/pkgs/development/libraries/csfml/default.nix b/nixpkgs/pkgs/development/libraries/csfml/default.nix
index 9b74ecdb0f7e..9b74ecdb0f7e 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 71e301044766..71e301044766 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 fd81de5139d6..fd81de5139d6 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 5a2a53ef24d5..5a2a53ef24d5 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 1e12afd95ca9..1e12afd95ca9 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 a2188f687d13..a2188f687d13 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 58f88e6d8ebf..58f88e6d8ebf 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 ba1d02380e29..ba1d02380e29 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 784a282f6b24..784a282f6b24 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 246dd009820c..246dd009820c 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 8be68a314e3d..8be68a314e3d 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 aa0708daaa7f..aa0708daaa7f 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 77b27640fd77..77b27640fd77 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 8662e812e995..8662e812e995 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 0bdaf1be9551..0bdaf1be9551 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 da96818ca267..da96818ca267 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/3.x.nix b/nixpkgs/pkgs/development/libraries/czmq/3.x.nix
index d418b879d1dd..d418b879d1dd 100644
--- a/pkgs/development/libraries/czmq/3.x.nix
+++ b/nixpkgs/pkgs/development/libraries/czmq/3.x.nix
diff --git a/pkgs/development/libraries/czmq/4.x.nix b/nixpkgs/pkgs/development/libraries/czmq/4.x.nix
index 13cee8fe86ba..13cee8fe86ba 100644
--- a/pkgs/development/libraries/czmq/4.x.nix
+++ b/nixpkgs/pkgs/development/libraries/czmq/4.x.nix
diff --git a/pkgs/development/libraries/czmq/czmq3-gcc7.patch b/nixpkgs/pkgs/development/libraries/czmq/czmq3-gcc7.patch
index 4ab14685a6c1..4ab14685a6c1 100644
--- a/pkgs/development/libraries/czmq/czmq3-gcc7.patch
+++ b/nixpkgs/pkgs/development/libraries/czmq/czmq3-gcc7.patch
diff --git a/pkgs/development/libraries/czmqpp/default.nix b/nixpkgs/pkgs/development/libraries/czmqpp/default.nix
index 0c026b9f47a5..0c026b9f47a5 100644
--- a/pkgs/development/libraries/czmqpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/czmqpp/default.nix
diff --git a/pkgs/development/libraries/czmqpp/socket.patch b/nixpkgs/pkgs/development/libraries/czmqpp/socket.patch
index 0464bcf77971..0464bcf77971 100644
--- a/pkgs/development/libraries/czmqpp/socket.patch
+++ b/nixpkgs/pkgs/development/libraries/czmqpp/socket.patch
diff --git a/pkgs/development/libraries/dav1d/default.nix b/nixpkgs/pkgs/development/libraries/dav1d/default.nix
index 157a6a21f3de..157a6a21f3de 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 ed916fcf4d1f..ed916fcf4d1f 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 652e962bbe18..652e962bbe18 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 aa46b8500b5a..aa46b8500b5a 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 caf19ffeb92b..caf19ffeb92b 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 a411e60dc39b..a411e60dc39b 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 76e30e921ba1..76e30e921ba1 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 7894e4c73262..7894e4c73262 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 bafca3bd52d2..bafca3bd52d2 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 96f7668aa903..96f7668aa903 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 bb501fb9c68d..bb501fb9c68d 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 163b0f4be883..163b0f4be883 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 c62377959608..c62377959608 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 0f897d97467f..0f897d97467f 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 cd020317f4c2..cd020317f4c2 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 18ea3ad3ecb7..18ea3ad3ecb7 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 14db5baea3fb..14db5baea3fb 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 abc32b90c6b8..abc32b90c6b8 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 e3a4a25cb720..e3a4a25cb720 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 5d441c5d1331..5d441c5d1331 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 9544aa13db56..9544aa13db56 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 dd644b4bce7c..dd644b4bce7c 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/dbus/systemd.patch b/nixpkgs/pkgs/development/libraries/dbus/systemd.patch
index 7e6cb1f87d07..7e6cb1f87d07 100644
--- a/pkgs/development/libraries/dbus/systemd.patch
+++ b/nixpkgs/pkgs/development/libraries/dbus/systemd.patch
diff --git a/pkgs/development/libraries/dbxml/cxx11.patch b/nixpkgs/pkgs/development/libraries/dbxml/cxx11.patch
index f264515c7d67..f264515c7d67 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 da7549aeea36..da7549aeea36 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 630dc972e188..630dc972e188 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 5a879e04c7d3..5a879e04c7d3 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 cd78d6d8a6ab..cd78d6d8a6ab 100644
--- a/pkgs/development/libraries/dclxvi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dclxvi/default.nix
diff --git a/pkgs/development/libraries/dee/default.nix b/nixpkgs/pkgs/development/libraries/dee/default.nix
index f0f31ae1ffc4..f0f31ae1ffc4 100644
--- a/pkgs/development/libraries/dee/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dee/default.nix
diff --git a/pkgs/development/libraries/dirac/default.nix b/nixpkgs/pkgs/development/libraries/dirac/default.nix
index 5b05d64f0727..5b05d64f0727 100644
--- a/pkgs/development/libraries/dirac/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dirac/default.nix
diff --git a/pkgs/development/libraries/dirac/dirac-1.0.2.patch b/nixpkgs/pkgs/development/libraries/dirac/dirac-1.0.2.patch
index 3d253b8f6d67..3d253b8f6d67 100644
--- a/pkgs/development/libraries/dirac/dirac-1.0.2.patch
+++ b/nixpkgs/pkgs/development/libraries/dirac/dirac-1.0.2.patch
diff --git a/pkgs/development/libraries/directfb/default.nix b/nixpkgs/pkgs/development/libraries/directfb/default.nix
index 3d831efbcb7d..3d831efbcb7d 100644
--- a/pkgs/development/libraries/directfb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/directfb/default.nix
diff --git a/pkgs/development/libraries/directfb/default.upstream b/nixpkgs/pkgs/development/libraries/directfb/default.upstream
index ef4ed8e490d1..ef4ed8e490d1 100644
--- a/pkgs/development/libraries/directfb/default.upstream
+++ b/nixpkgs/pkgs/development/libraries/directfb/default.upstream
diff --git a/pkgs/development/libraries/dleyna-connector-dbus/default.nix b/nixpkgs/pkgs/development/libraries/dleyna-connector-dbus/default.nix
index d52f1b6a2cff..d52f1b6a2cff 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 cc50c1598005..cc50c1598005 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 9d83812fefb7..9d83812fefb7 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 87b5c67dff58..87b5c67dff58 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 18244d83dee7..18244d83dee7 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 3255695ab23e..3255695ab23e 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 4730d4559503..4730d4559503 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 67a56855bb79..67a56855bb79 100644
--- a/pkgs/development/libraries/dlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dlib/default.nix
diff --git a/pkgs/development/libraries/docopt_cpp/default.nix b/nixpkgs/pkgs/development/libraries/docopt_cpp/default.nix
index 83466b693f59..83466b693f59 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 a2b2e08fd622..a2b2e08fd622 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 e1c59846aec5..e1c59846aec5 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 701464071d03..701464071d03 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 095697762ddd..095697762ddd 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 093abe085f0a..093abe085f0a 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 c85f6de0405c..c85f6de0405c 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 9be19f51e7e8..9be19f51e7e8 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 832b013123dd..832b013123dd 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 704f5c51c9c9..704f5c51c9c9 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 4ca9eab51bbe..4ca9eab51bbe 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 78f80d2baf42..78f80d2baf42 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 62f04e061cfa..62f04e061cfa 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 6dfd4edd0716..6dfd4edd0716 100644
--- a/pkgs/development/libraries/editline/default.nix
+++ b/nixpkgs/pkgs/development/libraries/editline/default.nix
diff --git a/pkgs/development/libraries/eigen/2.0.nix b/nixpkgs/pkgs/development/libraries/eigen/2.0.nix
index 015aeaed55ba..015aeaed55ba 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 6aec15f976bb..6aec15f976bb 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 c0c05efc466c..c0c05efc466c 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 7f3bd88557ec..7f3bd88557ec 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 710338842f8d..710338842f8d 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 6408ac471577..6408ac471577 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 c1764e83c303..c1764e83c303 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 c973c2bd9449..c973c2bd9449 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 b7303468cbaf..b7303468cbaf 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 8b559bd03c82..8b559bd03c82 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 c0df404e60eb..c0df404e60eb 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 c4285eadabc0..c4285eadabc0 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 8f38ee27174b..8f38ee27174b 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 da2fd13465f2..da2fd13465f2 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 838693ba12d0..838693ba12d0 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 3bc5270f0537..3bc5270f0537 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 9b05165e1b2b..9b05165e1b2b 100644
--- a/pkgs/development/libraries/exiv2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/exiv2/default.nix
diff --git a/pkgs/development/libraries/exiv2/fix-cmake.patch b/nixpkgs/pkgs/development/libraries/exiv2/fix-cmake.patch
index 1e19aed8b904..1e19aed8b904 100644
--- a/pkgs/development/libraries/exiv2/fix-cmake.patch
+++ b/nixpkgs/pkgs/development/libraries/exiv2/fix-cmake.patch
diff --git a/pkgs/development/libraries/exosip/default.nix b/nixpkgs/pkgs/development/libraries/exosip/default.nix
index 240f3c136ef5..240f3c136ef5 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 ef2574019459..ef2574019459 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 c568a670f553..c568a670f553 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 e7e4835d2ed3..e7e4835d2ed3 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 c23fc0bc59f6..c23fc0bc59f6 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 e884bb41e20e..e884bb41e20e 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 bac867978f43..bac867978f43 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 e781e2aab838..e781e2aab838 100644
--- a/pkgs/development/libraries/fastpbkdf2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fastpbkdf2/default.nix
diff --git a/pkgs/development/libraries/fcgi/default.nix b/nixpkgs/pkgs/development/libraries/fcgi/default.nix
index de78647dc483..de78647dc483 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 c6806c12c067..c6806c12c067 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 a37ebe7c5e06..a37ebe7c5e06 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 9b7cea3ebbcb..9b7cea3ebbcb 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/1.nix b/nixpkgs/pkgs/development/libraries/fflas-ffpack/1.nix
index eae0326c832f..eae0326c832f 100644
--- a/pkgs/development/libraries/fflas-ffpack/1.nix
+++ b/nixpkgs/pkgs/development/libraries/fflas-ffpack/1.nix
diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix
index a67210e860cd..a67210e860cd 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 db606cc02d63..db606cc02d63 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-sixel/default.nix b/nixpkgs/pkgs/development/libraries/ffmpeg-sixel/default.nix
index 4607d3e2f197..4607d3e2f197 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 5ffbc215d8b3..5ffbc215d8b3 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 5db1e0a47cfc..5db1e0a47cfc 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 3066e0b12e58..3066e0b12e58 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 72929e127bcc..72929e127bcc 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 a1cc11fb8c1e..a1cc11fb8c1e 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 1ad861fc63d8..1ad861fc63d8 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 bc5de5f9730f..bc5de5f9730f 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 4a2bed6b4979..4a2bed6b4979 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 a25f3ea04e27..a25f3ea04e27 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 504b58b6aa4d..504b58b6aa4d 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 8518545665c9..8518545665c9 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 79257fd6be50..79257fd6be50 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 4c4949b37be8..4c4949b37be8 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 49fcaa2b3f9b..49fcaa2b3f9b 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 f987899e3bcb..f987899e3bcb 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 0e259aebd8a5..0e259aebd8a5 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 798e388b23c2..798e388b23c2 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 408198bda5cb..408198bda5cb 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 5b8cc2d0383f..5b8cc2d0383f 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 d92a0c61aab8..d92a0c61aab8 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 0b4172cdc764..0b4172cdc764 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 3cdebe184d7e..3cdebe184d7e 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 60773d29d3d6..60773d29d3d6 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 9e55b011b571..9e55b011b571 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 2cfc87d6a2e5..2cfc87d6a2e5 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 84ab5fedebcd..84ab5fedebcd 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 61a96af618a4..61a96af618a4 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/nixpkgs/pkgs/development/libraries/folly/default.nix
diff --git a/pkgs/development/libraries/fontconfig-ultimate/default.nix b/nixpkgs/pkgs/development/libraries/fontconfig-ultimate/default.nix
index 9aeb12344ece..9aeb12344ece 100644
--- a/pkgs/development/libraries/fontconfig-ultimate/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fontconfig-ultimate/default.nix
diff --git a/pkgs/development/libraries/fontconfig/2.10.nix b/nixpkgs/pkgs/development/libraries/fontconfig/2.10.nix
index 1d66735569d5..1d66735569d5 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 e86f08fb553c..e86f08fb553c 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 f730e3e3408f..f730e3e3408f 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fontconfig/default.nix
diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
index 2ee0af8cfc13..2ee0af8cfc13 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 b18d72e0a228..b18d72e0a228 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 dddbbe9e516b..dddbbe9e516b 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/fox/clang.patch b/nixpkgs/pkgs/development/libraries/fox/clang.patch
index 0ca2ebf0d8da..0ca2ebf0d8da 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 40430f34334c..40430f34334c 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 4f1e0eaee7fb..4f1e0eaee7fb 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 952ecb0eadeb..952ecb0eadeb 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 063217a45047..063217a45047 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 e15626a160e2..e15626a160e2 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 c6ea5bbd23ba..c6ea5bbd23ba 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 c34d9591d386..c34d9591d386 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 b2c66ad346d0..b2c66ad346d0 100644
--- a/pkgs/development/libraries/freeimage/default.nix
+++ b/nixpkgs/pkgs/development/libraries/freeimage/default.nix
diff --git a/pkgs/development/libraries/freenect/default.nix b/nixpkgs/pkgs/development/libraries/freenect/default.nix
index 3771880d3608..3771880d3608 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 ee63ce2f2f9e..ee63ce2f2f9e 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 8c6f60b98010..8c6f60b98010 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 4658ac049df9..4658ac049df9 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 6b3577eb4f02..6b3577eb4f02 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 bd964c3342d8..bd964c3342d8 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 cdeddd82b71d..cdeddd82b71d 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 b60f4be245e2..b60f4be245e2 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 68f3c9d0ee59..68f3c9d0ee59 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 3fcf218d6b56..3fcf218d6b56 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 289a57399854..289a57399854 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 100c00eea497..100c00eea497 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 1486b5bfc55a..1486b5bfc55a 100644
--- a/pkgs/development/libraries/g2o/default.nix
+++ b/nixpkgs/pkgs/development/libraries/g2o/default.nix
diff --git a/pkgs/development/libraries/gamin/deadlock.patch b/nixpkgs/pkgs/development/libraries/gamin/deadlock.patch
index e2abc8ce2d97..e2abc8ce2d97 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 a8f334fb3c39..a8f334fb3c39 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 46d2420b21ed..46d2420b21ed 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 4cff22457403..4cff22457403 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 3944b14be64c..3944b14be64c 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 58356f0bc676..58356f0bc676 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 c1f9c6ad0137..c1f9c6ad0137 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 7e35ed2e5309..7e35ed2e5309 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 ee5988b30f57..ee5988b30f57 100644
--- a/pkgs/development/libraries/gcab/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gcab/default.nix
diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/nixpkgs/pkgs/development/libraries/gcc/libgcc/default.nix
index d638c2bb2788..d638c2bb2788 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 4762d1fb119f..4762d1fb119f 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 8c91d75f2a53..8c91d75f2a53 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 5462e0e33ecd..5462e0e33ecd 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 693fda99759c..693fda99759c 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 5ceded0546c5..5ceded0546c5 100644
--- a/pkgs/development/libraries/gd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gd/default.nix
diff --git a/pkgs/development/libraries/gdal/default.nix b/nixpkgs/pkgs/development/libraries/gdal/default.nix
index e7ffdde6cb1c..e7ffdde6cb1c 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 32101221e64c..32101221e64c 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 50504c62eddb..50504c62eddb 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 a9b79dac7b88..a9b79dac7b88 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 972e9022235a..972e9022235a 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 fca567d683dd..fca567d683dd 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 48c232c122b3..48c232c122b3 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 1da2b0a10dcd..1da2b0a10dcd 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 5a7dcd792996..5a7dcd792996 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 45a29e15ede8..45a29e15ede8 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 e8982c4b70a4..e8982c4b70a4 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 7567d1049fc0..7567d1049fc0 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 32e1163e0f07..32e1163e0f07 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 9a6b5d9cf273..9a6b5d9cf273 100644
--- a/pkgs/development/libraries/gecode/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gecode/default.nix
diff --git a/pkgs/development/libraries/gegl/3.0.nix b/nixpkgs/pkgs/development/libraries/gegl/3.0.nix
index 54ee7662d06e..54ee7662d06e 100644
--- a/pkgs/development/libraries/gegl/3.0.nix
+++ b/nixpkgs/pkgs/development/libraries/gegl/3.0.nix
diff --git a/pkgs/development/libraries/gegl/4.0.nix b/nixpkgs/pkgs/development/libraries/gegl/4.0.nix
index 0e3f79b1814c..0e3f79b1814c 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 e90cc257e7e8..e90cc257e7e8 100644
--- a/pkgs/development/libraries/gegl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gegl/default.nix
diff --git a/pkgs/development/libraries/geis/default.nix b/nixpkgs/pkgs/development/libraries/geis/default.nix
index e1f243f8fd3b..e1f243f8fd3b 100644
--- a/pkgs/development/libraries/geis/default.nix
+++ b/nixpkgs/pkgs/development/libraries/geis/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 9eb53acebb0a..9eb53acebb0a 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 466720176a92..466720176a92 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 c1d0d7e8a4f1..c1d0d7e8a4f1 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 499c68008088..499c68008088 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 1b1f7373709f..1b1f7373709f 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 3bed670cc307..3bed670cc307 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 22e7d216e6cd..22e7d216e6cd 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 0493071ee228..0493071ee228 100644
--- a/pkgs/development/libraries/getdns/default.nix
+++ b/nixpkgs/pkgs/development/libraries/getdns/default.nix
diff --git a/pkgs/development/libraries/gettext/CVE-2018-18751-bison.patch b/nixpkgs/pkgs/development/libraries/gettext/CVE-2018-18751-bison.patch
index b734c1c8b027..b734c1c8b027 100644
--- a/pkgs/development/libraries/gettext/CVE-2018-18751-bison.patch
+++ b/nixpkgs/pkgs/development/libraries/gettext/CVE-2018-18751-bison.patch
diff --git a/pkgs/development/libraries/gettext/absolute-paths.diff b/nixpkgs/pkgs/development/libraries/gettext/absolute-paths.diff
index af37f61a9a41..af37f61a9a41 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 6eb8bae435be..6eb8bae435be 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 ad3763c29b64..ad3763c29b64 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/gexiv2/default.nix b/nixpkgs/pkgs/development/libraries/gexiv2/default.nix
index 7203f8531c27..7203f8531c27 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 a00e07376c7b..a00e07376c7b 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 1bdcb7d8b28d..1bdcb7d8b28d 100644
--- a/pkgs/development/libraries/gfbgraph/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gfbgraph/default.nix
diff --git a/pkgs/development/libraries/ggz_base_libs/default.nix b/nixpkgs/pkgs/development/libraries/ggz_base_libs/default.nix
index 6003c5ea33ea..6003c5ea33ea 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 b166a69043e8..b166a69043e8 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 941a7c27feaf..941a7c27feaf 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/5.1.nix b/nixpkgs/pkgs/development/libraries/giflib/5.1.nix
index fee760b3ea26..fee760b3ea26 100644
--- a/pkgs/development/libraries/giflib/5.1.nix
+++ b/nixpkgs/pkgs/development/libraries/giflib/5.1.nix
diff --git a/pkgs/development/libraries/giflib/libungif.nix b/nixpkgs/pkgs/development/libraries/giflib/libungif.nix
index 6336d30aebad..6336d30aebad 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 b0a115eb4a51..b0a115eb4a51 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 514d21def1e0..514d21def1e0 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 3101bc64333e..3101bc64333e 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 d73a448f1662..d73a448f1662 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 1a97150aa48c..1a97150aa48c 100644
--- a/pkgs/development/libraries/givaro/default.nix
+++ b/nixpkgs/pkgs/development/libraries/givaro/default.nix
diff --git a/pkgs/development/libraries/glbinding/default.nix b/nixpkgs/pkgs/development/libraries/glbinding/default.nix
index 60778df663a0..60778df663a0 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 dd72637f2eb0..dd72637f2eb0 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 b265cfcc0168..b265cfcc0168 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 ec56c544cac3..ec56c544cac3 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 b1118b473b6f..b1118b473b6f 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 13bd4a456c97..13bd4a456c97 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 4f853e9821ff..4f853e9821ff 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/darwin-compilation.patch b/nixpkgs/pkgs/development/libraries/glib/darwin-compilation.patch
index f215eef798af..f215eef798af 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 4b577d36857a..4b577d36857a 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 4fdec2dd7e7d..4fdec2dd7e7d 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 d72d0b61dca2..d72d0b61dca2 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 168086484314..168086484314 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 1cb5a730351b..1cb5a730351b 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 a1cb1f40c58a..a1cb1f40c58a 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 942f3e7864c4..942f3e7864c4 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/glibc/allow-kernel-2.6.32.patch b/nixpkgs/pkgs/development/libraries/glibc/allow-kernel-2.6.32.patch
index ce18b874c427..ce18b874c427 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 33c8e5076daa..33c8e5076daa 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 7b224924104b..7b224924104b 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 444d6c458fb6..444d6c458fb6 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 f84b1049adf8..f84b1049adf8 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 894e2a11cf87..894e2a11cf87 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-rpc-types-musl-conflicts.patch b/nixpkgs/pkgs/development/libraries/glibc/fix-rpc-types-musl-conflicts.patch
index 19f8bfc7cce8..19f8bfc7cce8 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 1d60dcd7988b..1d60dcd7988b 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 714e49db5607..714e49db5607 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 5cb004cc870d..5cb004cc870d 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 d732e208fa22..d732e208fa22 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 0dc191974155..0dc191974155 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 5d3626b95cc0..5d3626b95cc0 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 39312951fcf9..39312951fcf9 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 3349449d9163..3349449d9163 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 829dca04c18c..829dca04c18c 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 319a0359c581..319a0359c581 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 269071434d57..269071434d57 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 3ef279616f75..3ef279616f75 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 10df82196c2e..10df82196c2e 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 9ae181e94530..9ae181e94530 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 d532e906a510..d532e906a510 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 1d35c0696d27..1d35c0696d27 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 59357bf6fb1b..59357bf6fb1b 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 b373095a8148..b373095a8148 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 699d2854f3db..699d2854f3db 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 6423e1fce981..6423e1fce981 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 a6035a2b7afd..a6035a2b7afd 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 494d9acb6bb6..494d9acb6bb6 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 de31128e5a67..de31128e5a67 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 c4ba086182a9..c4ba086182a9 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 0fac97aaa439..0fac97aaa439 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 64738300aba4..64738300aba4 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 0b2fb9fef6c3..0b2fb9fef6c3 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 501fe4d0849f..501fe4d0849f 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-sharp/default.nix b/nixpkgs/pkgs/development/libraries/gnome-sharp/default.nix
index f2393a23dfef..f2393a23dfef 100644
--- a/pkgs/development/libraries/gnome-sharp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gnome-sharp/default.nix
diff --git a/pkgs/development/libraries/gnu-config/default.nix b/nixpkgs/pkgs/development/libraries/gnu-config/default.nix
index 7918fb7b9c4b..7918fb7b9c4b 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 036863c9c0bf..036863c9c0bf 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 e245496c63ac..e245496c63ac 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 75c71632aebc..75c71632aebc 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 e0a54052c23e..e0a54052c23e 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 90d1e85ee8c0..90d1e85ee8c0 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 7f5808e50535..7f5808e50535 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 d4160b51d68c..d4160b51d68c 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 6e56d3fab411..6e56d3fab411 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 b1fdb916b5ce..b1fdb916b5ce 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 a68d544cfbe5..a68d544cfbe5 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 65b5a1a13b91..65b5a1a13b91 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 a14c40e6d87e..a14c40e6d87e 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 5694c50e90a3..5694c50e90a3 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 3dcd1d0a107f..3dcd1d0a107f 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 99b1307179a5..99b1307179a5 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 435c1f30bace..435c1f30bace 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 b7f56837686d..b7f56837686d 100644
--- a/pkgs/development/libraries/goocanvasmm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/goocanvasmm/default.nix
diff --git a/pkgs/development/libraries/google-gflags/default.nix b/nixpkgs/pkgs/development/libraries/google-gflags/default.nix
index fefc3a8b4b81..fefc3a8b4b81 100644
--- a/pkgs/development/libraries/google-gflags/default.nix
+++ b/nixpkgs/pkgs/development/libraries/google-gflags/default.nix
diff --git a/pkgs/development/libraries/gperftools/default.nix b/nixpkgs/pkgs/development/libraries/gperftools/default.nix
index 44339c3dfedd..44339c3dfedd 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 c462f2e685a2..c462f2e685a2 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 a48490ffae57..a48490ffae57 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 52c087b19147..52c087b19147 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-nix-profiles.patch b/nixpkgs/pkgs/development/libraries/grantlee/5/grantlee-nix-profiles.patch
index f6c13dbd6d55..f6c13dbd6d55 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 d78ef74ce352..d78ef74ce352 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 9c4015a1c197..9c4015a1c197 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 b51cb4a31909..b51cb4a31909 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 1446e339745e..1446e339745e 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 0aae8ca49453..0aae8ca49453 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 d6a441e1577c..d6a441e1577c 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 253fce4ea0da..253fce4ea0da 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 224cd125dce6..224cd125dce6 100644
--- a/pkgs/development/libraries/grib-api/default.nix
+++ b/nixpkgs/pkgs/development/libraries/grib-api/default.nix
diff --git a/pkgs/development/libraries/grpc/default.nix b/nixpkgs/pkgs/development/libraries/grpc/default.nix
index 77773e91e174..77773e91e174 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 899aa116b2ca..899aa116b2ca 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 d454ca63fd7f..d454ca63fd7f 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 3f9cd8120d89..3f9cd8120d89 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 0aa2034e3996..0aa2034e3996 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 88a4ecb36225..88a4ecb36225 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 5da2b4c157e8..5da2b4c157e8 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 7c15e10620a5..7c15e10620a5 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 c4d23bd834c9..c4d23bd834c9 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 887376d31874..887376d31874 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 655f73931f67..655f73931f67 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 a4738e4b6a73..a4738e4b6a73 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 c8846509d004..c8846509d004 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 e5772c8772ec..e5772c8772ec 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 33583a4c6bb3..33583a4c6bb3 100644
--- a/pkgs/development/libraries/gsm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gsm/default.nix
diff --git a/pkgs/development/libraries/gsoap/default.nix b/nixpkgs/pkgs/development/libraries/gsoap/default.nix
index f099d3fabc04..f099d3fabc04 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 337a2472babd..337a2472babd 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 776125a7537d..776125a7537d 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 a9ee776d441c..a9ee776d441c 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 3c49b579b9ca..3c49b579b9ca 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 ba59a2514375..ba59a2514375 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 c687fffc9c08..c687fffc9c08 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 87bbef227de8..87bbef227de8 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 04486a4647f9..04486a4647f9 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 fa838d5ff773..fa838d5ff773 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 c388a82fa2a8..c388a82fa2a8 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 b8c741af578f..b8c741af578f 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 94d71760a7f8..94d71760a7f8 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 61d39bc96369..61d39bc96369 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 1e12f3bbfbea..1e12f3bbfbea 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 b76142c9d86d..b76142c9d86d 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 f68ad603a37c..f68ad603a37c 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 35c278da03b1..35c278da03b1 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 402074a4e5f4..402074a4e5f4 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 77465645d237..77465645d237 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 db75705c825a..db75705c825a 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 fd9f6ea240d2..fd9f6ea240d2 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 7ecb6c34b432..7ecb6c34b432 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 f13d3a166714..f13d3a166714 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 22cff574134f..22cff574134f 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 2f46016adac8..2f46016adac8 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 c8414a7b681b..c8414a7b681b 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 d0c9960e5d22..d0c9960e5d22 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 67dfc34434db..67dfc34434db 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 c70e898a47d8..c70e898a47d8 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 65ce26112519..65ce26112519 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 8acaefcedf46..8acaefcedf46 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/legacy/qt-gstreamer/boost1.48.patch b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/boost1.48.patch
index c48eec68a640..c48eec68a640 100644
--- a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/boost1.48.patch
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/boost1.48.patch
diff --git a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix
index 9797f21c1685..9797f21c1685 100644
--- a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix
diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix
index 297c8ada884e..297c8ada884e 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/qt-gstreamer/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
index a099643061a1..a099643061a1 100644
--- a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
index c4620a29e945..c4620a29e945 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 5c3a56814bad..5c3a56814bad 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 c0541857e8b7..c0541857e8b7 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 06d275078f30..06d275078f30 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 d0a2d3691b49..d0a2d3691b49 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 b9cbcf4c5c75..b9cbcf4c5c75 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 9ceb571983e2..9ceb571983e2 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 c05e3a9326ae..c05e3a9326ae 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/gtk+/2.0-darwin-x11.patch b/nixpkgs/pkgs/development/libraries/gtk+/2.0-darwin-x11.patch
index 9725cfb84260..9725cfb84260 100644
--- a/pkgs/development/libraries/gtk+/2.0-darwin-x11.patch
+++ b/nixpkgs/pkgs/development/libraries/gtk+/2.0-darwin-x11.patch
diff --git a/pkgs/development/libraries/gtk+/2.0-immodules.cache.patch b/nixpkgs/pkgs/development/libraries/gtk+/2.0-immodules.cache.patch
index 1b8231756e71..1b8231756e71 100644
--- a/pkgs/development/libraries/gtk+/2.0-immodules.cache.patch
+++ b/nixpkgs/pkgs/development/libraries/gtk+/2.0-immodules.cache.patch
diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/nixpkgs/pkgs/development/libraries/gtk+/2.x.nix
index 8dad69eb998a..8dad69eb998a 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.0-darwin-x11.patch b/nixpkgs/pkgs/development/libraries/gtk+/3.0-darwin-x11.patch
index 86631634b5bd..86631634b5bd 100644
--- a/pkgs/development/libraries/gtk+/3.0-darwin-x11.patch
+++ b/nixpkgs/pkgs/development/libraries/gtk+/3.0-darwin-x11.patch
diff --git a/pkgs/development/libraries/gtk+/3.0-immodules.cache.patch b/nixpkgs/pkgs/development/libraries/gtk+/3.0-immodules.cache.patch
index bbe5f28dbd3e..bbe5f28dbd3e 100644
--- a/pkgs/development/libraries/gtk+/3.0-immodules.cache.patch
+++ b/nixpkgs/pkgs/development/libraries/gtk+/3.0-immodules.cache.patch
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/nixpkgs/pkgs/development/libraries/gtk+/3.x.nix
index 378f3904d5d1..378f3904d5d1 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+/gtk2-theme-paths.patch b/nixpkgs/pkgs/development/libraries/gtk+/gtk2-theme-paths.patch
index edd69b078076..edd69b078076 100644
--- a/pkgs/development/libraries/gtk+/gtk2-theme-paths.patch
+++ b/nixpkgs/pkgs/development/libraries/gtk+/gtk2-theme-paths.patch
diff --git a/pkgs/development/libraries/gtk+/setup-hook.sh b/nixpkgs/pkgs/development/libraries/gtk+/setup-hook.sh
index c2b0ab502db7..c2b0ab502db7 100644
--- a/pkgs/development/libraries/gtk+/setup-hook.sh
+++ b/nixpkgs/pkgs/development/libraries/gtk+/setup-hook.sh
diff --git a/pkgs/development/libraries/gtk-mac-integration/default.nix b/nixpkgs/pkgs/development/libraries/gtk-mac-integration/default.nix
index 26d0b5c35958..26d0b5c35958 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 7f35f088da2b..7f35f088da2b 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 659dc14800e1..659dc14800e1 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 f8f1f20cc2fd..f8f1f20cc2fd 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 4b8f757540b5..4b8f757540b5 100644
--- a/pkgs/development/libraries/gtk-sharp/builder.sh
+++ b/nixpkgs/pkgs/development/libraries/gtk-sharp/builder.sh
diff --git a/pkgs/development/libraries/gtkd/default.nix b/nixpkgs/pkgs/development/libraries/gtkd/default.nix
index b69e99e0fb8a..b69e99e0fb8a 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 0f857136499f..0f857136499f 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 1caac3914a58..1caac3914a58 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 d6d32c26a509..d6d32c26a509 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 12b9181a952e..12b9181a952e 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 14ad594b38b8..14ad594b38b8 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 0ebd31ef2a78..0ebd31ef2a78 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 69fd3f30e92d..69fd3f30e92d 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 1a5b0fe62875..1a5b0fe62875 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 c87350167c25..c87350167c25 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 9d1751afaf91..9d1751afaf91 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 a35d9a88d0df..a35d9a88d0df 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 553e9fd9cbb6..553e9fd9cbb6 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 d60bb29c47ae..d60bb29c47ae 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 455cc4d4b81e..455cc4d4b81e 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 f0baecb19904..f0baecb19904 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 14676be0dcb9..14676be0dcb9 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 cb141f8c5569..cb141f8c5569 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 d0da7f8cef61..d0da7f8cef61 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 17ca323a5fef..17ca323a5fef 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 b764ce2c2e21..b764ce2c2e21 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 4dfbaafdc327..4dfbaafdc327 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 56a274316e89..56a274316e89 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 a69df33dd650..a69df33dd650 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 ffe9b68fd043..ffe9b68fd043 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 78a2d365033e..78a2d365033e 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 1d6bad1914ba..1d6bad1914ba 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 d235c6cb0869..d235c6cb0869 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 b9cd31432fc3..b9cd31432fc3 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 a405633c1b8d..a405633c1b8d 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 77c1ca07dc9c..77c1ca07dc9c 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 a5f8f00a6bfd..a5f8f00a6bfd 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 05e180161c0b..05e180161c0b 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 59e168115a86..59e168115a86 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 13f7c4219069..13f7c4219069 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 37f01372005c..37f01372005c 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 bacd34e8515d..bacd34e8515d 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 df3581cc8095..df3581cc8095 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 99777bbd6f0f..99777bbd6f0f 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 32743e617970..32743e617970 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 ec6b304dc3ce..ec6b304dc3ce 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 1537f9cc480b..1537f9cc480b 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 6348ba24f8da..6348ba24f8da 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 5922cdfb5848..5922cdfb5848 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 68bf4ebec347..68bf4ebec347 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/default.nix b/nixpkgs/pkgs/development/libraries/hunspell/default.nix
index 3728c05e516c..3728c05e516c 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 b8de133f5025..b8de133f5025 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 34c3d26c55ec..34c3d26c55ec 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 0f4ce4e6b97c..0f4ce4e6b97c 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 09b7751c8284..09b7751c8284 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 bc0ce15a083d..bc0ce15a083d 100644
--- a/pkgs/development/libraries/hyperscan/default.nix
+++ b/nixpkgs/pkgs/development/libraries/hyperscan/default.nix
diff --git a/pkgs/development/libraries/icu/58.nix b/nixpkgs/pkgs/development/libraries/icu/58.nix
index f7763ba49da1..f7763ba49da1 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 9ca66ca525fd..9ca66ca525fd 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 e56135b15c62..e56135b15c62 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 719318990c62..719318990c62 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 c7bdd22c1793..c7bdd22c1793 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 0a8cb7d46843..0a8cb7d46843 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 ddce76b10f72..ddce76b10f72 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 2b7457d54c79..2b7457d54c79 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 b05d2cf298d3..b05d2cf298d3 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 d4ebb5534d9c..d4ebb5534d9c 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 867ce024d2fe..867ce024d2fe 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 3452c72839fd..3452c72839fd 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 2f9605a3a72f..2f9605a3a72f 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 8abff4c5f059..8abff4c5f059 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 f3206700cb89..f3206700cb89 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 a5b226ee9c74..a5b226ee9c74 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 b97f62dcf25c..b97f62dcf25c 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 edd8e7a32797..edd8e7a32797 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 cb83322ebb65..cb83322ebb65 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 e4b07bc08963..e4b07bc08963 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 bb6e23937c05..bb6e23937c05 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 db6af6daebd0..db6af6daebd0 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 207a440a0d85..207a440a0d85 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 2d22788e1ecd..2d22788e1ecd 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 b55d13ecc3f4..b55d13ecc3f4 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 a6281156afa1..a6281156afa1 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 2576580908a3..2576580908a3 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 a4a009c66580..a4a009c66580 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 36b637c62bb2..36b637c62bb2 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 023572976351..023572976351 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 5816f044f574..5816f044f574 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 0f497419e706..0f497419e706 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 8beda8663c5c..8beda8663c5c 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 a3c568cdde43..a3c568cdde43 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 37d648bdf76b..37d648bdf76b 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 0ee66c9050cb..0ee66c9050cb 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 274058b7ec99..274058b7ec99 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 a48908f41dd4..a48908f41dd4 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 d28ae012e574..d28ae012e574 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 20a60f1a102d..20a60f1a102d 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 1ff4b7ec18a0..1ff4b7ec18a0 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 59d4d38ce574..59d4d38ce574 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 72ef581725b9..72ef581725b9 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 6fbd1f9d478b..6fbd1f9d478b 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 43ab20da8ae0..43ab20da8ae0 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/default.nix b/nixpkgs/pkgs/development/libraries/itk/default.nix
index 6e393ba02ce6..6e393ba02ce6 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 29fabdbb3b63..29fabdbb3b63 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 25b55f00311b..25b55f00311b 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 946bc17e7643..946bc17e7643 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 8d9b4e54fe8d..8d9b4e54fe8d 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 e3c464482c7e..e3c464482c7e 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 3c729f42320a..3c729f42320a 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 6fddc3cfe0c3..6fddc3cfe0c3 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 03b083328da4..03b083328da4 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 e46f22fadfb9..e46f22fadfb9 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 4e3fa2655020..4e3fa2655020 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 10c39f037890..10c39f037890 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 de031a08fe8c..de031a08fe8c 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 f2054ee9d4d3..f2054ee9d4d3 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 5ec10cc7e0df..5ec10cc7e0df 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 6af8885464a3..6af8885464a3 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 d37e110011e8..d37e110011e8 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 e34699d7740e..e34699d7740e 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 8c2502385f2b..8c2502385f2b 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 ec407076906d..ec407076906d 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/builder.sh b/nixpkgs/pkgs/development/libraries/java/hsqldb/builder.sh
index d7de23ab95eb..d7de23ab95eb 100755
--- a/pkgs/development/libraries/java/hsqldb/builder.sh
+++ b/nixpkgs/pkgs/development/libraries/java/hsqldb/builder.sh
diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/nixpkgs/pkgs/development/libraries/java/hsqldb/default.nix
index a478ab0fc502..a478ab0fc502 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 273850082958..273850082958 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 500c575f73aa..500c575f73aa 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 7d1fac39b1cb..7d1fac39b1cb 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 dbec4b6f3e0e..dbec4b6f3e0e 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 16755471acd7..16755471acd7 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 744419dcd533..744419dcd533 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 0879f0a69260..0879f0a69260 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 97fd42d0b81b..97fd42d0b81b 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 bc34957b9c3e..bc34957b9c3e 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 402f893034b6..402f893034b6 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 98291a7763ca..98291a7763ca 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 be3ddfff4c84..be3ddfff4c84 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 d95feb5eeb44..d95feb5eeb44 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 691b9905b04f..691b9905b04f 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 fd5d1a20869c..fd5d1a20869c 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 ae93765ff981..ae93765ff981 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 544f0f4c4e91..544f0f4c4e91 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 dac7b209069a..dac7b209069a 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 687e1e8a1deb..687e1e8a1deb 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 c97259e6a17e..c97259e6a17e 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 e28925c65bb2..e28925c65bb2 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 0dc9e8bd892c..0dc9e8bd892c 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 04a165866faf..04a165866faf 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 2b2f75abfd17..2b2f75abfd17 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 dfb0003cc98a..dfb0003cc98a 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 c14ac7c65abd..c14ac7c65abd 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 7ea7bccd6b87..7ea7bccd6b87 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 d328ab8016a1..d328ab8016a1 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 175097ef7855..175097ef7855 100644
--- a/pkgs/development/libraries/jitterentropy/default.nix
+++ b/nixpkgs/pkgs/development/libraries/jitterentropy/default.nix
diff --git a/pkgs/development/libraries/json-c/default.nix b/nixpkgs/pkgs/development/libraries/json-c/default.nix
index 27d1b701f054..27d1b701f054 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 9a18b025fabe..9a18b025fabe 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 fa2b45ae948e..fa2b45ae948e 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 8012c6b3b149..8012c6b3b149 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 01ba605b506c..01ba605b506c 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 47c87da065ba..47c87da065ba 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 0cd8ab503566..0cd8ab503566 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 0766a589a2e0..0766a589a2e0 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 d5da9f5af176..d5da9f5af176 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 9717e770ed51..9717e770ed51 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 c8382ed3408b..c8382ed3408b 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 62ae433ff710..62ae433ff710 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 654eb94b51ac..654eb94b51ac 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 bd105d2b4a9c..bd105d2b4a9c 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 b4569e50a5f7..b4569e50a5f7 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 88091e78a0cd..88091e78a0cd 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 afab8a4e9a43..afab8a4e9a43 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 58b064806e52..58b064806e52 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 b558306248ae..b558306248ae 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 eabac6aadd7e..eabac6aadd7e 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 ca5e773a45b9..ca5e773a45b9 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 8c55f8da6a0c..8c55f8da6a0c 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 c66f5ecd008f..c66f5ecd008f 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 c94c8b91ecd2..c94c8b91ecd2 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 d2689425c387..d2689425c387 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 dc2339632e45..dc2339632e45 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/kcmutils/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
index 0c661dcdd48e..0c661dcdd48e 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 0411755f45a6..0411755f45a6 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 cc041b9aa3b8..cc041b9aa3b8 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 f2c22554a455..f2c22554a455 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 978db644a56f..978db644a56f 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 fdfe28db6c04..fdfe28db6c04 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 2650843aa55d..2650843aa55d 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 3b6ea27d41e5..3b6ea27d41e5 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 3943e5d6d494..3943e5d6d494 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 d5a407ee16f2..d5a407ee16f2 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 d45d73d33e41..d45d73d33e41 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 c94167d5d76d..c94167d5d76d 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 34e01b4c1b62..34e01b4c1b62 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 65377789582e..65377789582e 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 7e3de9d4d141..7e3de9d4d141 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 eabb70254483..eabb70254483 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 9b08ab208774..9b08ab208774 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 21ac2e83b5da..21ac2e83b5da 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 8418863eabb5..8418863eabb5 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 df60511b5115..df60511b5115 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 b7dcfb7fe64c..b7dcfb7fe64c 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 9e2f827eff59..9e2f827eff59 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 68b5c08aa090..68b5c08aa090 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 4e3a33efab32..4e3a33efab32 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 2928d9b34dbe..2928d9b34dbe 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 b7f4f036db5e..b7f4f036db5e 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 732f7b69c828..732f7b69c828 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 c72cb5b71a43..c72cb5b71a43 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 d2689425c387..d2689425c387 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 ca015151e0f1..ca015151e0f1 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 66cd8ddf64f6..66cd8ddf64f6 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 2ede69e74953..2ede69e74953 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 5bb3078ea867..5bb3078ea867 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 3b9ca74bbd07..3b9ca74bbd07 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 f7cb0ea3aacc..f7cb0ea3aacc 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 4b8e0059377d..4b8e0059377d 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 ab5cc8a3edb2..ab5cc8a3edb2 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 a1e53bb408bd..a1e53bb408bd 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 29748a5f7f42..29748a5f7f42 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 538078fd7457..538078fd7457 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 75e632d41292..75e632d41292 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 b949723fb543..b949723fb543 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 9195a4e8e6b0..9195a4e8e6b0 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 e3bfc2ebe6b4..e3bfc2ebe6b4 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 281778d9d07f..281778d9d07f 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 d26af49e5eb2..d26af49e5eb2 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 3e18d304c307..3e18d304c307 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 5330c40a3306..5330c40a3306 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 f4fc40f6d31d..f4fc40f6d31d 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 91bc3e2b98d4..91bc3e2b98d4 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 004d1ac77a6d..004d1ac77a6d 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 810e2bf8c84e..810e2bf8c84e 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 311f07241d65..311f07241d65 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 e8cd5070ae53..e8cd5070ae53 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 a4714c9e4ad7..a4714c9e4ad7 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 70f3cbb3c37e..70f3cbb3c37e 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 964e1b441154..964e1b441154 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 6739f96183c1..6739f96183c1 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 c1c9efde7f74..c1c9efde7f74 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 6779faa50cdc..6779faa50cdc 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 cab334838ee7..cab334838ee7 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 9b7f076efc70..9b7f076efc70 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 f657569277a1..f657569277a1 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 04181fd3e13a..04181fd3e13a 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 380fd8fc5e34..380fd8fc5e34 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 150c5b3d2b26..150c5b3d2b26 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 f45fb5ecd1d0..f45fb5ecd1d0 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 826999f2f9be..826999f2f9be 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 356e6537a4fd..356e6537a4fd 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 cf98ffb9067f..cf98ffb9067f 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 fdd8b4d81a18..fdd8b4d81a18 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 3ce22dbd35a0..3ce22dbd35a0 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 c633aee30a1b..c633aee30a1b 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 8b082f7f3655..8b082f7f3655 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 d6c079fd83b8..d6c079fd83b8 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 fca0dedd083e..fca0dedd083e 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 ee19b39bd159..ee19b39bd159 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 63a95bc217c8..63a95bc217c8 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 c075adf02941..c075adf02941 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 ae0da37922e9..ae0da37922e9 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 2cd02056ff81..2cd02056ff81 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 b9aede81f9a9..b9aede81f9a9 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 acffde6a7cf1..acffde6a7cf1 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 195e90feef6f..195e90feef6f 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 4ded321674f7..4ded321674f7 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 2d795bfc50cc..2d795bfc50cc 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 44005ec7d282..44005ec7d282 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 cf74ee20c2d7..cf74ee20c2d7 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 147c4123a105..147c4123a105 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 d1beb03fa620..d1beb03fa620 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 cccd92513583..cccd92513583 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 17473db9eebd..17473db9eebd 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 71ee520995c4..71ee520995c4 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 ceb8200d4c63..ceb8200d4c63 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 b95f70dd6743..b95f70dd6743 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 50f3e6a6c025..50f3e6a6c025 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 a0fa625538b7..a0fa625538b7 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 d2283f5c1d57..d2283f5c1d57 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 208f294aef7e..208f294aef7e 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 abbb2457f6ae..abbb2457f6ae 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 91ad59ad27a0..91ad59ad27a0 100644
--- a/pkgs/development/libraries/keybinder3/default.nix
+++ b/nixpkgs/pkgs/development/libraries/keybinder3/default.nix
diff --git a/pkgs/development/libraries/kinetic-cpp-client/build-fix.patch b/nixpkgs/pkgs/development/libraries/kinetic-cpp-client/build-fix.patch
index 49edbf63a546..49edbf63a546 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 0fa46dde23e2..0fa46dde23e2 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 d3733ea5f720..d3733ea5f720 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 5c53f5e6ad5d..5c53f5e6ad5d 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 c49402b74e86..c49402b74e86 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 fc9c77e8fd61..fc9c77e8fd61 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 897f33953afb..897f33953afb 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 374d9c398eff..374d9c398eff 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 2f713cb59775..2f713cb59775 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 dcff8c2757e1..dcff8c2757e1 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 2c418c1bc5f5..2c418c1bc5f5 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 a00c3be4193e..a00c3be4193e 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 9037f1093bb9..9037f1093bb9 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 b99cb4f595a4..b99cb4f595a4 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 c2d449ed13c6..c2d449ed13c6 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 55c2ec20a312..55c2ec20a312 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 6ea449387172..6ea449387172 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 792d958213fb..792d958213fb 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 f1bbff47a28e..f1bbff47a28e 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 11069c6b02c7..11069c6b02c7 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 d35f2c8333aa..d35f2c8333aa 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 d588da3f8b6e..d588da3f8b6e 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 9b05cf3e1393..9b05cf3e1393 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 08069bb333bc..08069bb333bc 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 48c41ac52f22..48c41ac52f22 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 779ec664996a..779ec664996a 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 c6c216f5abf3..c6c216f5abf3 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 aeadb0759530..aeadb0759530 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 ab047d0516eb..ab047d0516eb 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 01a78b5b4be6..01a78b5b4be6 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 3189637df746..3189637df746 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 b5e62b960c0a..b5e62b960c0a 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 e93467fba0a2..e93467fba0a2 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 8f2f32297828..8f2f32297828 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 63c81822ddf8..63c81822ddf8 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 5d307dcfa7ad..5d307dcfa7ad 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 839f0a75156b..839f0a75156b 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 12f7b176bb7b..12f7b176bb7b 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 82496a54aea7..82496a54aea7 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 95924050ff32..95924050ff32 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 f4018cbf9614..f4018cbf9614 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 dd3c42e8b7f5..dd3c42e8b7f5 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 2d298d5f4c4e..2d298d5f4c4e 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 1699dbe19084..1699dbe19084 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 69f9a2464c6d..69f9a2464c6d 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 b678a0893867..b678a0893867 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 b18af4cf8344..b18af4cf8344 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 b814f077f308..b814f077f308 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 32fecd3d99c1..32fecd3d99c1 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 7e41743e1e0d..7e41743e1e0d 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 39f493d821c3..39f493d821c3 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 15ef9ee890a6..15ef9ee890a6 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 0d67c6b4dcb2..0d67c6b4dcb2 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 6df7bc22772f..6df7bc22772f 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 6d49682f03ae..6d49682f03ae 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/libabw/default.nix b/nixpkgs/pkgs/development/libraries/libabw/default.nix
index aa4a40cf32dd..aa4a40cf32dd 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 525ec6e35f60..525ec6e35f60 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 4179f4fa0af0..4179f4fa0af0 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 49e5bcdd9058..49e5bcdd9058 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 c1e9ba7d1c73..c1e9ba7d1c73 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 53c6a5b89dad..53c6a5b89dad 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 cc6c9464de36..cc6c9464de36 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 9f8d700929b4..9f8d700929b4 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 28f0ca2905c2..28f0ca2905c2 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 826f72b1f5fb..826f72b1f5fb 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 62e0a850bad3..62e0a850bad3 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 dd3320005a41..dd3320005a41 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 46cc30a8944f..46cc30a8944f 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 f2a1c500a8be..f2a1c500a8be 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 a1a04a1dd7b2..a1a04a1dd7b2 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 a06ae978d515..a06ae978d515 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 d7ebf781a049..d7ebf781a049 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 d55c38168686..d55c38168686 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 313cb7f8d5dc..313cb7f8d5dc 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 f7805c9f375f..f7805c9f375f 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 0df8ed0f9699..0df8ed0f9699 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 eebe667badb9..eebe667badb9 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 1ef453f24cdb..1ef453f24cdb 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 456828c025ef..456828c025ef 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 726e9573d374..726e9573d374 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 6a7720b99bcc..6a7720b99bcc 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 09c5444a6446..09c5444a6446 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 2a129bc648f0..2a129bc648f0 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 3a1b77525143..3a1b77525143 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 64b3832d3353..64b3832d3353 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 d22518e96d42..d22518e96d42 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 a807e3998273..a807e3998273 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 85822165d8c5..85822165d8c5 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 7863e596e1b8..7863e596e1b8 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 d8f2426e477b..d8f2426e477b 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 8d9c5d0fbba7..8d9c5d0fbba7 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 b7ca9dda1ea7..b7ca9dda1ea7 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 0f9cc9aaf964..0f9cc9aaf964 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 a8d1925e5c0d..a8d1925e5c0d 100644
--- a/pkgs/development/libraries/libbsd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libbsd/default.nix
diff --git a/pkgs/development/libraries/libbsd/musl.patch b/nixpkgs/pkgs/development/libraries/libbsd/musl.patch
index fc07cfb6e855..fc07cfb6e855 100644
--- a/pkgs/development/libraries/libbsd/musl.patch
+++ b/nixpkgs/pkgs/development/libraries/libbsd/musl.patch
diff --git a/pkgs/development/libraries/libbson/default.nix b/nixpkgs/pkgs/development/libraries/libbson/default.nix
index 6244c3a351e7..6244c3a351e7 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 f68141ef3b47..f68141ef3b47 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 97f8e17a5f62..97f8e17a5f62 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 8949ea8e390e..8949ea8e390e 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 f116360474e4..f116360474e4 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 6d76c9411147..6d76c9411147 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 6838362c7942..6838362c7942 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 fe2f0eadeeb3..fe2f0eadeeb3 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 218eaeea571a..218eaeea571a 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 591369df83f1..591369df83f1 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 48e632ba52d8..48e632ba52d8 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 9c3132a3e637..9c3132a3e637 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 f7276d39b14a..f7276d39b14a 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 e016484e6779..e016484e6779 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 0005525a7cd2..0005525a7cd2 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 9e7d608b5124..9e7d608b5124 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 96c3db6ae43b..96c3db6ae43b 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 fd5ee8dcaaf9..fd5ee8dcaaf9 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 1a0be52dbbe5..1a0be52dbbe5 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 410c83953aa9..410c83953aa9 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 d3ef799ef605..d3ef799ef605 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 c802bd68ab08..c802bd68ab08 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 b6cdc77caa84..b6cdc77caa84 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 82b6cb995ef3..82b6cb995ef3 100644
--- a/pkgs/development/libraries/libchop/size_t.patch
+++ b/nixpkgs/pkgs/development/libraries/libchop/size_t.patch
diff --git a/pkgs/development/libraries/libclc/default.nix b/nixpkgs/pkgs/development/libraries/libclc/default.nix
index 78f5e9d233ca..78f5e9d233ca 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 f101eb223106..f101eb223106 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 2814d6c5c1ea..2814d6c5c1ea 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 a2f6858a05c9..a2f6858a05c9 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 49bc2347ba77..49bc2347ba77 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 53474190ce96..53474190ce96 100644
--- a/pkgs/development/libraries/libcmis/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcmis/default.nix
diff --git a/pkgs/development/libraries/libcollectdclient/default.nix b/nixpkgs/pkgs/development/libraries/libcollectdclient/default.nix
index 0f1cbeb2f96f..0f1cbeb2f96f 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 f247c48821f7..f247c48821f7 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 cdc225c8bf73..cdc225c8bf73 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 ee3f511d4359..ee3f511d4359 100644
--- a/pkgs/development/libraries/libconfuse/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libconfuse/default.nix
diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix
index 894faf0b9102..894faf0b9102 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 fff31a96ce77..fff31a96ce77 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 10a4c276ebd5..10a4c276ebd5 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 90ed8c6d985d..90ed8c6d985d 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 e5c09675c4b0..e5c09675c4b0 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 fef8e7f510df..fef8e7f510df 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 3d32f4d0b953..3d32f4d0b953 100644
--- a/pkgs/development/libraries/libcsptr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcsptr/default.nix
diff --git a/pkgs/development/libraries/libctemplate/default.nix b/nixpkgs/pkgs/development/libraries/libctemplate/default.nix
index 94dc733a69b0..94dc733a69b0 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 e50b8a13b950..e50b8a13b950 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 81122a6eb520..81122a6eb520 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 5dc153dd5ccc..5dc153dd5ccc 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 51c5133afede..51c5133afede 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 067144ddfa0c..067144ddfa0c 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 28d9152dcee7..28d9152dcee7 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 99cd636b03b8..99cd636b03b8 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 b242bd8613ef..b242bd8613ef 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 72c3ca0e2b05..72c3ca0e2b05 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 32b0c9758f73..32b0c9758f73 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 e064084f695e..e064084f695e 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 86b9fcd0bef3..86b9fcd0bef3 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 6c9fabf5cae7..6c9fabf5cae7 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 db5448caa102..db5448caa102 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 78e7490cd992..78e7490cd992 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 5fc53c2dc6a7..5fc53c2dc6a7 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 c220e6802fd9..c220e6802fd9 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 7fe7319ff15e..7fe7319ff15e 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 e3172c2fc1f8..e3172c2fc1f8 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 287494b6b1fd..287494b6b1fd 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 c94806b50c10..c94806b50c10 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 01ac56e885d0..01ac56e885d0 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 f5248dfc79e6..f5248dfc79e6 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 46e264b59caf..46e264b59caf 100644
--- a/pkgs/development/libraries/libdnet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdnet/default.nix
diff --git a/pkgs/development/libraries/libdrm/default.nix b/nixpkgs/pkgs/development/libraries/libdrm/default.nix
index 4ed3ad356a9f..4ed3ad356a9f 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 a5058de597ef..a5058de597ef 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 0984eb6e00bf..0984eb6e00bf 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 f18e0622d0cc..f18e0622d0cc 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 18e2689002e8..18e2689002e8 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 b0dfd1e8fc12..b0dfd1e8fc12 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 fbe56023a91c..fbe56023a91c 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 5f0f08275035..5f0f08275035 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 1a4da7713af4..1a4da7713af4 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 5ee92b463857..5ee92b463857 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 93ece69cf056..93ece69cf056 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 805b1869ac38..805b1869ac38 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 a06a9af99bb4..a06a9af99bb4 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 5127231dab60..5127231dab60 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 293b1c28e932..293b1c28e932 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 2d15e419a764..2d15e419a764 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 6a4078f92cf3..6a4078f92cf3 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 be9f5e772d91..be9f5e772d91 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 33bd39ed61e5..33bd39ed61e5 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 e46a7ec33c4d..e46a7ec33c4d 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 7255b3fece42..7255b3fece42 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 26fe2d90963a..26fe2d90963a 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 5105bf7e73f0..5105bf7e73f0 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 e282d9005dbb..e282d9005dbb 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 e04c8ee202a0..e04c8ee202a0 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 e4b4e592b7a5..e4b4e592b7a5 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 2eb1bd0e4fc4..2eb1bd0e4fc4 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 59780699fd13..59780699fd13 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 980cee2e6879..980cee2e6879 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 b8f62901eed4..b8f62901eed4 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 b09c2dd0f47e..b09c2dd0f47e 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 922207f1ccea..922207f1ccea 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 7998655e46b6..7998655e46b6 100644
--- a/pkgs/development/libraries/libevdev/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libevdev/default.nix
diff --git a/pkgs/development/libraries/libevent/default.nix b/nixpkgs/pkgs/development/libraries/libevent/default.nix
index 611287b9aaa8..611287b9aaa8 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 d150d4a00330..d150d4a00330 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 a61d51aa6b72..a61d51aa6b72 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 5a8f5126680e..5a8f5126680e 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 43e6abe1a39f..43e6abe1a39f 100644
--- a/pkgs/development/libraries/libextractor/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libextractor/default.nix
diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/nixpkgs/pkgs/development/libraries/libexttextcat/default.nix
index 7b3df42c24c3..7b3df42c24c3 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 2de407e8f639..2de407e8f639 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 e36c4ee12b94..e36c4ee12b94 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 f553afdfc709..f553afdfc709 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 7b7e362fbf0f..7b7e362fbf0f 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 5ac7a244df20..5ac7a244df20 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 513a4dc3d384..513a4dc3d384 100644
--- a/pkgs/development/libraries/libffcall/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libffcall/default.nix
diff --git a/pkgs/development/libraries/libffi/3.2.1-cygwin.patch b/nixpkgs/pkgs/development/libraries/libffi/3.2.1-cygwin.patch
index f3b38dbd1c16..f3b38dbd1c16 100644
--- a/pkgs/development/libraries/libffi/3.2.1-cygwin.patch
+++ b/nixpkgs/pkgs/development/libraries/libffi/3.2.1-cygwin.patch
diff --git a/pkgs/development/libraries/libffi/default.nix b/nixpkgs/pkgs/development/libraries/libffi/default.nix
index 2918276ef211..2918276ef211 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 b670172ce1ee..b670172ce1ee 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 4a051f34b0ba..4a051f34b0ba 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 4b02d651929b..4b02d651929b 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 2d2d56dda4f2..2d2d56dda4f2 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 a0323481be9a..a0323481be9a 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 410496a7bb77..410496a7bb77 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 f4863eb33f26..f4863eb33f26 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 cfae74b4b9e3..cfae74b4b9e3 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 5491fab3edf2..5491fab3edf2 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 1b00ff4c0fbb..1b00ff4c0fbb 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 74b87a46ef0a..74b87a46ef0a 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 b039c84b2fb1..b039c84b2fb1 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 a6fe2bc1435f..a6fe2bc1435f 100644
--- a/pkgs/development/libraries/libgaminggear/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgaminggear/default.nix
diff --git a/pkgs/development/libraries/libgap/default.nix b/nixpkgs/pkgs/development/libraries/libgap/default.nix
index 42e812ec1f53..42e812ec1f53 100644
--- a/pkgs/development/libraries/libgap/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgap/default.nix
diff --git a/pkgs/development/libraries/libgcrypt/1.5.nix b/nixpkgs/pkgs/development/libraries/libgcrypt/1.5.nix
index 80cb6641bfba..80cb6641bfba 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 4d8a7eac27c8..4d8a7eac27c8 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 bb6402dc4287..bb6402dc4287 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 f5cc5efa06a1..f5cc5efa06a1 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 59e19750715f..59e19750715f 100644
--- a/pkgs/development/libraries/libgdata/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgdata/default.nix
diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/nixpkgs/pkgs/development/libraries/libgdiplus/default.nix
index ba9eab432029..ba9eab432029 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 260c3a3d97bf..260c3a3d97bf 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 33b9e7830e71..33b9e7830e71 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 70ec222f88fb..70ec222f88fb 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 08fce9c521ec..08fce9c521ec 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 d5edefc5d54b..d5edefc5d54b 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 9bec00b9f52d..9bec00b9f52d 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 5c007be5b4b4..5c007be5b4b4 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 0f22166fb8b7..0f22166fb8b7 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 dd52b8247fa4..dd52b8247fa4 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 3787ef6bfc13..3787ef6bfc13 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 2c3a8cc786bb..2c3a8cc786bb 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 b9fb77f27147..b9fb77f27147 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 e423af16b44c..e423af16b44c 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 62c6b45c5d45..62c6b45c5d45 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 33a6a075ae44..33a6a075ae44 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 0951ab1fe0c0..0951ab1fe0c0 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 e87f535a1f74..e87f535a1f74 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 f3e1b8b0f997..f3e1b8b0f997 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 8616a0146755..8616a0146755 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 c498ef3460ac..c498ef3460ac 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 b77690bd1593..b77690bd1593 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 89fcfdfde8da..89fcfdfde8da 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 bd5a5f068515..bd5a5f068515 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 86a8a935769c..86a8a935769c 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 8fc44fb6a8dc..8fc44fb6a8dc 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 f2d31cf16762..f2d31cf16762 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 0177869d3e39..0177869d3e39 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 fe7986bf21aa..fe7986bf21aa 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 d3dea766cbbb..d3dea766cbbb 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 9c2b317ab086..9c2b317ab086 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 e3d7741ba869..e3d7741ba869 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 09c4b1393ce7..09c4b1393ce7 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 d5d35678b4fb..d5d35678b4fb 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 3300e9b1d680..3300e9b1d680 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 30e5e247ab2b..30e5e247ab2b 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 9c3d9faf1f4f..9c3d9faf1f4f 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 9e72d933433b..9e72d933433b 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 0830b45b308b..0830b45b308b 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 5dc1fb938340..5dc1fb938340 100644
--- a/pkgs/development/libraries/libhdhomerun/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libhdhomerun/default.nix
diff --git a/pkgs/development/libraries/libheif/1.4.0-CVE-2019-11471.patch b/nixpkgs/pkgs/development/libraries/libheif/1.4.0-CVE-2019-11471.patch
index 2ea1b124ce7b..2ea1b124ce7b 100644
--- a/pkgs/development/libraries/libheif/1.4.0-CVE-2019-11471.patch
+++ b/nixpkgs/pkgs/development/libraries/libheif/1.4.0-CVE-2019-11471.patch
diff --git a/pkgs/development/libraries/libheif/default.nix b/nixpkgs/pkgs/development/libraries/libheif/default.nix
index 3182345bfd48..3182345bfd48 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 c58812eca58b..c58812eca58b 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 ab1858c51a61..ab1858c51a61 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 00bd7e6eeea7..00bd7e6eeea7 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 689e9a0be5dd..689e9a0be5dd 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 b86a48ecd1ba..b86a48ecd1ba 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 59d23e490e5a..59d23e490e5a 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 298d6124505c..298d6124505c 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 c5379692ad30..c5379692ad30 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 f89361a62998..f89361a62998 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 b1f9d0978cec..b1f9d0978cec 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 0a828b334cf8..0a828b334cf8 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 4b7d9bdc2e32..4b7d9bdc2e32 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 e3df7b3f9df0..e3df7b3f9df0 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 8291499daf31..8291499daf31 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 5ec5b8e04dd0..5ec5b8e04dd0 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 e2202abd947c..e2202abd947c 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 4fa3addc0a66..4fa3addc0a66 100644
--- a/pkgs/development/libraries/libiec61883/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libiec61883/default.nix
diff --git a/pkgs/development/libraries/libiio/default.nix b/nixpkgs/pkgs/development/libraries/libiio/default.nix
index ee8029966dc2..ee8029966dc2 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 83afd26bf1d3..83afd26bf1d3 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 83a500c13802..83a500c13802 100644
--- a/pkgs/development/libraries/libimobiledevice/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix
diff --git a/pkgs/development/libraries/libindicate/default.nix b/nixpkgs/pkgs/development/libraries/libindicate/default.nix
index f6dc85b629dd..f6dc85b629dd 100644
--- a/pkgs/development/libraries/libindicate/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libindicate/default.nix
diff --git a/pkgs/development/libraries/libindicator/default.nix b/nixpkgs/pkgs/development/libraries/libindicator/default.nix
index 33691f79a4c8..33691f79a4c8 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 c57590aad218..c57590aad218 100644
--- a/pkgs/development/libraries/libinfinity/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libinfinity/default.nix
diff --git a/pkgs/development/libraries/libinotify-kqueue/default.nix b/nixpkgs/pkgs/development/libraries/libinotify-kqueue/default.nix
index 6fc507daf641..6fc507daf641 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 0c759835183b..0c759835183b 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 5c85b8639486..5c85b8639486 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 ad55c6cb18f3..ad55c6cb18f3 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 fea5a86da446..fea5a86da446 100644
--- a/pkgs/development/libraries/libipfix/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libipfix/default.nix
diff --git a/pkgs/development/libraries/libiptcdata/default.nix b/nixpkgs/pkgs/development/libraries/libiptcdata/default.nix
index 8e1ca68a69e7..8e1ca68a69e7 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 71238dda1620..71238dda1620 100644
--- a/pkgs/development/libraries/libircclient/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libircclient/default.nix
diff --git a/pkgs/development/libraries/libisoburn/default.nix b/nixpkgs/pkgs/development/libraries/libisoburn/default.nix
index ce2028e805dc..ce2028e805dc 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 d52814483870..d52814483870 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 0b00cf90ba00..0b00cf90ba00 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 9419046db4ed..9419046db4ed 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 68835c1414c3..68835c1414c3 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 0f2c9dce28a2..0f2c9dce28a2 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 371d7b838d40..371d7b838d40 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 9b9483d63987..9b9483d63987 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 58ca9a790baf..58ca9a790baf 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 96dbd463370b..96dbd463370b 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 2167b4477034..2167b4477034 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 f352c8e9ed19..f352c8e9ed19 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 c83143dd6b13..c83143dd6b13 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 f074c8ba3aa5..f074c8ba3aa5 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 7eff302397aa..7eff302397aa 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 93f3b2a4f84d..93f3b2a4f84d 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 c83a3e40df27..c83a3e40df27 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 92e7d26f5afa..92e7d26f5afa 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 8b5f189a9e1e..8b5f189a9e1e 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 24dd34d7a6a3..24dd34d7a6a3 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 b7d90100837c..b7d90100837c 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 d9f460d44e8c..d9f460d44e8c 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 cafd6a66aa00..cafd6a66aa00 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 313780a9f0f0..313780a9f0f0 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 1a177dc22374..1a177dc22374 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 2ba5750b1bf3..2ba5750b1bf3 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 46ea9fe6ee59..46ea9fe6ee59 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 d0aaebadbaad..d0aaebadbaad 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 d77b452e3e92..d77b452e3e92 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 c2731e44efbc..c2731e44efbc 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 aa6922ea3421..aa6922ea3421 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 1a5a4baf8086..1a5a4baf8086 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 d6918ef30443..d6918ef30443 100644
--- a/pkgs/development/libraries/libltc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libltc/default.nix
diff --git a/pkgs/development/libraries/libmad/001-mips_removal_h_constraint.patch b/nixpkgs/pkgs/development/libraries/libmad/001-mips_removal_h_constraint.patch
index 1d8b385e0c57..1d8b385e0c57 100644
--- a/pkgs/development/libraries/libmad/001-mips_removal_h_constraint.patch
+++ b/nixpkgs/pkgs/development/libraries/libmad/001-mips_removal_h_constraint.patch
diff --git a/pkgs/development/libraries/libmad/default.nix b/nixpkgs/pkgs/development/libraries/libmad/default.nix
index f6df090e8b5d..f6df090e8b5d 100644
--- a/pkgs/development/libraries/libmad/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmad/default.nix
diff --git a/pkgs/development/libraries/libmad/optimize.diff b/nixpkgs/pkgs/development/libraries/libmad/optimize.diff
index 1418dc927073..1418dc927073 100644
--- a/pkgs/development/libraries/libmad/optimize.diff
+++ b/nixpkgs/pkgs/development/libraries/libmad/optimize.diff
diff --git a/pkgs/development/libraries/libmad/pkgconfig.patch b/nixpkgs/pkgs/development/libraries/libmad/pkgconfig.patch
index 0ac88acb8415..0ac88acb8415 100644
--- a/pkgs/development/libraries/libmad/pkgconfig.patch
+++ b/nixpkgs/pkgs/development/libraries/libmad/pkgconfig.patch
diff --git a/pkgs/development/libraries/libmanette/default.nix b/nixpkgs/pkgs/development/libraries/libmanette/default.nix
index 701238750512..701238750512 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 8ff02b49e584..8ff02b49e584 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 0f43c0d46164..0f43c0d46164 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 b10a62fd389a..b10a62fd389a 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 f1b15a91ccac..f1b15a91ccac 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 406b88ea8c1b..406b88ea8c1b 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 2ce11b998a1a..2ce11b998a1a 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 de8baa7ad198..de8baa7ad198 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 64d2cc7577c3..64d2cc7577c3 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 172b9cd88da5..172b9cd88da5 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 d2fba5cddd82..d2fba5cddd82 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 e5e21c433587..e5e21c433587 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 eb2a6bc980eb..eb2a6bc980eb 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 e46eb9208de6..e46eb9208de6 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 1e3a5d680df6..1e3a5d680df6 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 d3f30a752732..d3f30a752732 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 3c55a6b036cc..3c55a6b036cc 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 f75d32c4313e..f75d32c4313e 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 284d415454de..284d415454de 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 aa606e2a177e..aa606e2a177e 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 f6d3574ca4c1..f6d3574ca4c1 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 bbc69a516ffd..bbc69a516ffd 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 aea7a5959fac..aea7a5959fac 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 9c89d2e8d7b8..9c89d2e8d7b8 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 7f73fb09cd16..7f73fb09cd16 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 749a5d60e467..749a5d60e467 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 7c4b451ae6d1..7c4b451ae6d1 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 182d642bc08d..182d642bc08d 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 858004910160..858004910160 100644
--- a/pkgs/development/libraries/libmodplug/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmodplug/default.nix
diff --git a/pkgs/development/libraries/libmongo-client/default.nix b/nixpkgs/pkgs/development/libraries/libmongo-client/default.nix
index 30cb8c9df2ff..30cb8c9df2ff 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 512add5616a0..512add5616a0 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 52072000115c..52072000115c 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 4df38a9cc3c9..4df38a9cc3c9 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 106f6fe6c37c..106f6fe6c37c 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 a5a4d68ad969..a5a4d68ad969 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 dac7cf48aac7..dac7cf48aac7 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 f1a061e5ab58..f1a061e5ab58 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 2cb4cd3cd9bf..2cb4cd3cd9bf 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 e750c2c6c70e..e750c2c6c70e 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 2b59adf8f922..2b59adf8f922 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 5335b6577f0a..5335b6577f0a 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 a7e52376e3f5..a7e52376e3f5 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 bcfb53770e1e..bcfb53770e1e 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 6653025eb056..6653025eb056 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 8719f19acc1d..8719f19acc1d 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 2b7258031c33..2b7258031c33 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 b461bfb3ddfe..b461bfb3ddfe 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 17626bb23e13..17626bb23e13 100644
--- a/pkgs/development/libraries/libnatpmp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix
diff --git a/pkgs/development/libraries/libnatspec/default.nix b/nixpkgs/pkgs/development/libraries/libnatspec/default.nix
index db4f6f5d4688..db4f6f5d4688 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 222a0df055bb..222a0df055bb 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 78304246f12b..78304246f12b 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 51e4deed462c..51e4deed462c 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 ba116e20177f..ba116e20177f 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 5eb86bc37b79..5eb86bc37b79 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 95533696ddf2..95533696ddf2 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 41245e6539f4..41245e6539f4 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 a680e009ab6a..a680e009ab6a 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 d16155374ca8..d16155374ca8 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 0d8de14513ed..0d8de14513ed 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 94b3dc90a0b6..94b3dc90a0b6 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 bef977caa28e..bef977caa28e 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 074bef42b97a..074bef42b97a 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 fa6461d86919..fa6461d86919 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 8ed6dfa8ac0d..8ed6dfa8ac0d 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 ad51ac8d6dbb..ad51ac8d6dbb 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 c6348b7b2e67..c6348b7b2e67 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 f4ce1f6eea03..f4ce1f6eea03 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 a4b0b26a345b..a4b0b26a345b 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 ddadb3cd97b6..ddadb3cd97b6 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 cb70d803ac0c..cb70d803ac0c 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 790064847432..790064847432 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 0a6c58c8a015..0a6c58c8a015 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 ea792b007bae..ea792b007bae 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 1723219e8597..1723219e8597 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 bd78e974e42f..bd78e974e42f 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 8131420cfd65..8131420cfd65 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 6723c08f0822..6723c08f0822 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 71a8e528771b..71a8e528771b 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 d7c3b747924a..d7c3b747924a 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 fb2dad605252..fb2dad605252 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 d86dd79c3bcb..d86dd79c3bcb 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 d53b1dc08308..d53b1dc08308 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 2ae3c3c871c5..2ae3c3c871c5 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 73d51ec49ffc..73d51ec49ffc 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 450b9058d0b9..450b9058d0b9 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 a29f8dc4a804..a29f8dc4a804 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 ca026811d69b..ca026811d69b 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 10d438500a63..10d438500a63 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 4ca0849447f3..4ca0849447f3 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 04f0db030bb0..04f0db030bb0 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 8d202a92d095..8d202a92d095 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 791e4d890f93..791e4d890f93 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 54ee86f0a39a..54ee86f0a39a 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 952509acc2ee..952509acc2ee 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 f0c7cc485f50..f0c7cc485f50 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 080a19452154..080a19452154 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 7797061a71aa..7797061a71aa 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 8c0094a3152b..8c0094a3152b 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 774019de0d5b..774019de0d5b 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 b4b72e5a36d3..b4b72e5a36d3 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 cf97744069b3..cf97744069b3 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 74879c4fe9b8..74879c4fe9b8 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 f7cbfeab4709..f7cbfeab4709 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 314d5884501f..314d5884501f 100644
--- a/pkgs/development/libraries/libpeas/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libpeas/default.nix
diff --git a/pkgs/development/libraries/libpfm/default.nix b/nixpkgs/pkgs/development/libraries/libpfm/default.nix
index bf1d26cf90d0..bf1d26cf90d0 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 f8c91df64683..f8c91df64683 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 4cb327ff527b..4cb327ff527b 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 26694eb37770..26694eb37770 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 eabf2d2a1064..eabf2d2a1064 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 c539e2dde970..c539e2dde970 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/libplist/default.nix b/nixpkgs/pkgs/development/libraries/libplist/default.nix
index d622584c9da4..d622584c9da4 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 2cd8c1debaf2..2cd8c1debaf2 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 849f7d29ef6d..849f7d29ef6d 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 cd841a9d8f84..cd841a9d8f84 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 f6f2412c818a..f6f2412c818a 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 3b050c3dc6a0..3b050c3dc6a0 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 c04c8d724d0b..c04c8d724d0b 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 7e2443d31e92..7e2443d31e92 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 564fb96d0be4..564fb96d0be4 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 7d697ee10f17..7d697ee10f17 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 49490e1f7854..49490e1f7854 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 25b088f99ec8..25b088f99ec8 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 e68c5052beb8..e68c5052beb8 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 f175bb6ea6d9..f175bb6ea6d9 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 8a2390483908..8a2390483908 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 048ba48bb674..048ba48bb674 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 cf848d02a048..cf848d02a048 100644
--- a/pkgs/development/libraries/libr3/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libr3/default.nix
diff --git a/pkgs/development/libraries/libraw/default.nix b/nixpkgs/pkgs/development/libraries/libraw/default.nix
index 1a998c044359..1a998c044359 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 a99e4d22077e..a99e4d22077e 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 d92b017712d4..d92b017712d4 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 14e3e1891bae..14e3e1891bae 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 3f4366771235..3f4366771235 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 124fd0178182..124fd0178182 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 30d8d8a94e9d..30d8d8a94e9d 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 c9debe61743d..c9debe61743d 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 db8dfcf2eecb..db8dfcf2eecb 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 82a71be52105..82a71be52105 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 50c20d12ccc8..50c20d12ccc8 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 2f78222cebb1..2f78222cebb1 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 4d875b693304..4d875b693304 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 3684fd924f77..3684fd924f77 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 d710c41a97c1..d710c41a97c1 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 e70ac9a53626..e70ac9a53626 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 2c6e792ae8ce..2c6e792ae8ce 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 78e47f83433f..78e47f83433f 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 d412e1e8ebb6..d412e1e8ebb6 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 71362fd7ef7b..71362fd7ef7b 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 3993451e19f0..3993451e19f0 100644
--- a/pkgs/development/libraries/libroxml/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libroxml/default.nix
diff --git a/pkgs/development/libraries/librsvg/default.nix b/nixpkgs/pkgs/development/libraries/librsvg/default.nix
index 0cbd60409b43..0cbd60409b43 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 3ca84ed2ce5f..3ca84ed2ce5f 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 e4e96df86c16..e4e96df86c16 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 dfec4bc48974..dfec4bc48974 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 b23bff415a25..b23bff415a25 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 2092d72c9f8d..2092d72c9f8d 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 479da52f8d9b..479da52f8d9b 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 785dac4aef29..785dac4aef29 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 6f30932ba6db..6f30932ba6db 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 6b38bcf2c778..6b38bcf2c778 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 6c2723bbd907..6c2723bbd907 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 2c34c1d8b7bf..2c34c1d8b7bf 100644
--- a/pkgs/development/libraries/libserialport/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libserialport/default.nix
diff --git a/pkgs/development/libraries/libsexy/default.nix b/nixpkgs/pkgs/development/libraries/libsexy/default.nix
index 49cdb2c95ba0..49cdb2c95ba0 100644
--- a/pkgs/development/libraries/libsexy/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsexy/default.nix
diff --git a/pkgs/development/libraries/libshout/default.nix b/nixpkgs/pkgs/development/libraries/libshout/default.nix
index 849c93962f88..849c93962f88 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 82caacf93e6a..82caacf93e6a 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 2da5d68d1174..2da5d68d1174 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 fa27a80e22ed..fa27a80e22ed 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 434dbfb9f725..434dbfb9f725 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 f3549d52f69e..f3549d52f69e 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 c7f49a6f6dcf..c7f49a6f6dcf 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 b50a7c371a74..b50a7c371a74 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 6f1c399041dd..6f1c399041dd 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 34d959423a36..34d959423a36 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 19ebbd363e1e..19ebbd363e1e 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 25f2a1e0846b..25f2a1e0846b 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 15d8169f1024..15d8169f1024 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 b150dd0f59c3..b150dd0f59c3 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 8c88abd2c441..8c88abd2c441 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 8ffae53be196..8ffae53be196 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 f53db7241cf7..f53db7241cf7 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 52a52e7e7324..52a52e7e7324 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 8018b84a52be..8018b84a52be 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 8e7b539527e1..8e7b539527e1 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 f1e4169bd48e..f1e4169bd48e 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 e9a4eda192ba..e9a4eda192ba 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/libspiro/default.nix b/nixpkgs/pkgs/development/libraries/libspiro/default.nix
index 00579600cb76..00579600cb76 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 5bae04a88f94..5bae04a88f94 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 7d9ea25e9d26..7d9ea25e9d26 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 65de6db3b47b..65de6db3b47b 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 d4205981499c..d4205981499c 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 8896447590ba..8896447590ba 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 67d6d8d42ead..67d6d8d42ead 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 400a107c5186..400a107c5186 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 c1e6a1f7fb89..c1e6a1f7fb89 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 6eb8b6b1a8e9..6eb8b6b1a8e9 100644
--- a/pkgs/development/libraries/libsvm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsvm/default.nix
diff --git a/pkgs/development/libraries/libtap/default.nix b/nixpkgs/pkgs/development/libraries/libtap/default.nix
index 29d83bcd9d70..29d83bcd9d70 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 f2cb879b3e07..f2cb879b3e07 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 302400388437..302400388437 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 4e859c282276..4e859c282276 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 0bc619051c69..0bc619051c69 100644
--- a/pkgs/development/libraries/libtelnet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtelnet/default.nix
diff --git a/pkgs/development/libraries/libtensorflow/default.nix b/nixpkgs/pkgs/development/libraries/libtensorflow/default.nix
index 98096371e400..98096371e400 100644
--- a/pkgs/development/libraries/libtensorflow/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtensorflow/default.nix
diff --git a/pkgs/development/libraries/libtermkey/default.nix b/nixpkgs/pkgs/development/libraries/libtermkey/default.nix
index 7261fb7b6b74..7261fb7b6b74 100644
--- a/pkgs/development/libraries/libtermkey/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtermkey/default.nix
diff --git a/pkgs/development/libraries/libtheora/default.nix b/nixpkgs/pkgs/development/libraries/libtheora/default.nix
index 81bd35ff293c..81bd35ff293c 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 55c747540f77..55c747540f77 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 7a72fa2b7a31..7a72fa2b7a31 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 c90cff31677b..c90cff31677b 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 f9e7f9684bac..f9e7f9684bac 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 a90377dad34a..a90377dad34a 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 046229e8f1d7..046229e8f1d7 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 50fdbf2a81f7..50fdbf2a81f7 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 c3981f5c58ea..c3981f5c58ea 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 d447be456e0e..d447be456e0e 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 18ceb5302292..18ceb5302292 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 b0be3cb3c12d..b0be3cb3c12d 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 aad8ae00c114..aad8ae00c114 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 ad0557049e3e..ad0557049e3e 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 6140c13e493d..6140c13e493d 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 71ac22e85a8f..71ac22e85a8f 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 5aa26a749e4f..5aa26a749e4f 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 3b45d4de8842..3b45d4de8842 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 dcc406accbd7..dcc406accbd7 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 42ee86fb550f..42ee86fb550f 100644
--- a/pkgs/development/libraries/libui/libui.pc
+++ b/nixpkgs/pkgs/development/libraries/libui/libui.pc
diff --git a/pkgs/development/libraries/libunarr/default.nix b/nixpkgs/pkgs/development/libraries/libunarr/default.nix
index e21f9400848d..e21f9400848d 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 50bc05395895..50bc05395895 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 1cc5b6e01be4..1cc5b6e01be4 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 f47e66267d50..f47e66267d50 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 b2e85e4d71a5..b2e85e4d71a5 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 927771e7311b..927771e7311b 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 b302e1d0ba03..b302e1d0ba03 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 b96fdf5eeddc..b96fdf5eeddc 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 2b0587510bc0..2b0587510bc0 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 e066c0723679..e066c0723679 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 a0ec3b74cc17..a0ec3b74cc17 100644
--- a/pkgs/development/libraries/libunity/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libunity/default.nix
diff --git a/pkgs/development/libraries/libunwind/backtrace-only-with-glibc.patch b/nixpkgs/pkgs/development/libraries/libunwind/backtrace-only-with-glibc.patch
index 5fcaa72c0c01..5fcaa72c0c01 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 9bea14bd8e85..9bea14bd8e85 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 90be77401141..90be77401141 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 cce10a761d3f..cce10a761d3f 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 adf354c45f2e..adf354c45f2e 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 ea9cbc34978e..ea9cbc34978e 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 0620163bb320..0620163bb320 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 d9e008af9770..d9e008af9770 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 f9703e3c5932..f9703e3c5932 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 bd5f56611ef9..bd5f56611ef9 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 ade3f5796d51..ade3f5796d51 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 9883de59feb1..9883de59feb1 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 6a0672445430..6a0672445430 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 1c008130f65f..1c008130f65f 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 50b995a03568..50b995a03568 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 d68422260144..d68422260144 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 0ace54582ebc..0ace54582ebc 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 6ca3d997e659..6ca3d997e659 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 74c3d24560cd..74c3d24560cd 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 c559d3f84071..c559d3f84071 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 a09e2cf2f72a..a09e2cf2f72a 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 6e8e2d95b6b0..6e8e2d95b6b0 100644
--- a/pkgs/development/libraries/libvisual/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libvisual/default.nix
diff --git a/pkgs/development/libraries/libvmi/default.nix b/nixpkgs/pkgs/development/libraries/libvmi/default.nix
index 44b2a81b2d3c..44b2a81b2d3c 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 0a7819743e03..0a7819743e03 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 5457b1075a3e..5457b1075a3e 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 cd0cc9798fa0..cd0cc9798fa0 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 75e935d18d90..75e935d18d90 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 472539ea24bb..472539ea24bb 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 a1e10b6d003d..a1e10b6d003d 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 b0457e76f2fc..b0457e76f2fc 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 7c1d58d2980f..7c1d58d2980f 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 2af550c7d99a..2af550c7d99a 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 e7aa5f7ecc9f..e7aa5f7ecc9f 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 9c35d3373505..9c35d3373505 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 2872181a36d8..2872181a36d8 100644
--- a/pkgs/development/libraries/libwnck/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libwnck/default.nix
diff --git a/pkgs/development/libraries/libwpd/0.8.nix b/nixpkgs/pkgs/development/libraries/libwpd/0.8.nix
index 736b1a45fa20..736b1a45fa20 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 56c598ca7de9..56c598ca7de9 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 05eb3293ed7c..05eb3293ed7c 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 e80cefe16e2d..e80cefe16e2d 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 76ac946d6187..76ac946d6187 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 10fc829d6743..10fc829d6743 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 d56c20cb75af..d56c20cb75af 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 286057c4ba87..286057c4ba87 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 30be467f9fd2..30be467f9fd2 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 9861e21f6559..9861e21f6559 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 2e00b5b5ab9c..2e00b5b5ab9c 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 7bd89b44d889..7bd89b44d889 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 b4ad501c2efe..b4ad501c2efe 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 f0e63efc0d14..f0e63efc0d14 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 65a1207dab3a..65a1207dab3a 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 510955d0af2e..510955d0af2e 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 773389e60f54..773389e60f54 100644
--- a/pkgs/development/libraries/libxklavier/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libxklavier/default.nix
diff --git a/pkgs/development/libraries/libxl/default.nix b/nixpkgs/pkgs/development/libraries/libxl/default.nix
index 44949cf2deb4..44949cf2deb4 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 a2a576edc0f7..a2a576edc0f7 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 aff5f8ac4451..aff5f8ac4451 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 33f818f7d62c..33f818f7d62c 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libxml2/default.nix
diff --git a/pkgs/development/libraries/libxmlb/default.nix b/nixpkgs/pkgs/development/libraries/libxmlb/default.nix
index 9edb9b475e8a..9edb9b475e8a 100644
--- a/pkgs/development/libraries/libxmlb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libxmlb/default.nix
diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/nixpkgs/pkgs/development/libraries/libxmlxx/default.nix
index c80808081ffb..c80808081ffb 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 94c2ca095829..94c2ca095829 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 ca4d7edbf32d..ca4d7edbf32d 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 cb93ec63e670..cb93ec63e670 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 41633d91f3bd..41633d91f3bd 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 af665c6d9a4a..af665c6d9a4a 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 c1f34bd33980..c1f34bd33980 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 9aa189586f05..9aa189586f05 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 be493828486c..be493828486c 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 710e7a3f0729..710e7a3f0729 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 010eecb0fa97..010eecb0fa97 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 2ad017dc90be..2ad017dc90be 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 f3cbddf1ec41..f3cbddf1ec41 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 afa7696aca99..afa7696aca99 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 50ed00711df7..50ed00711df7 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 1413da4a18db..1413da4a18db 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 410c60bff9f3..410c60bff9f3 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 3f963c7ca19a..3f963c7ca19a 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 ab0e51bae261..ab0e51bae261 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 9af0c20d7014..9af0c20d7014 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 5fa1035868d1..5fa1035868d1 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 e3c38f05ab4c..e3c38f05ab4c 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 6bbcc725f22f..6bbcc725f22f 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 99ea6343d70f..99ea6343d70f 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 9c1815f840b4..9c1815f840b4 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 13fbe2b55b67..13fbe2b55b67 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 bf5b7bb1d0da..bf5b7bb1d0da 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 9d57d4721820..9d57d4721820 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 ddb247b7f113..ddb247b7f113 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 232a67c23f3b..232a67c23f3b 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 f0904726eedf..f0904726eedf 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 cc86ab19379d..cc86ab19379d 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 d2918c87f335..d2918c87f335 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 8e8541564245..8e8541564245 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 e583e7661d1d..e583e7661d1d 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 b2fba7df509b..b2fba7df509b 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 2ff927048ad5..2ff927048ad5 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 cad5d0d7ecad..cad5d0d7ecad 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 87fc170c80da..87fc170c80da 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 7ac495777b54..7ac495777b54 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 6e5fe6aa6f82..6e5fe6aa6f82 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 92e32828a03c..92e32828a03c 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 50baad6a7a0b..50baad6a7a0b 100644
--- a/pkgs/development/libraries/luabind/default.nix
+++ b/nixpkgs/pkgs/development/libraries/luabind/default.nix
diff --git a/pkgs/development/libraries/luaffi/darwin.patch b/nixpkgs/pkgs/development/libraries/luaffi/darwin.patch
index 50db81b776d7..50db81b776d7 100644
--- a/pkgs/development/libraries/luaffi/darwin.patch
+++ b/nixpkgs/pkgs/development/libraries/luaffi/darwin.patch
diff --git a/pkgs/development/libraries/luaffi/default.nix b/nixpkgs/pkgs/development/libraries/luaffi/default.nix
index 065562ac82ec..065562ac82ec 100644
--- a/pkgs/development/libraries/luaffi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/luaffi/default.nix
diff --git a/pkgs/development/libraries/luaffi/makefile-errors.patch b/nixpkgs/pkgs/development/libraries/luaffi/makefile-errors.patch
index 0ee6e6390068..0ee6e6390068 100644
--- a/pkgs/development/libraries/luaffi/makefile-errors.patch
+++ b/nixpkgs/pkgs/development/libraries/luaffi/makefile-errors.patch
diff --git a/pkgs/development/libraries/lucene++/default.nix b/nixpkgs/pkgs/development/libraries/lucene++/default.nix
index c45fa6bc61aa..c45fa6bc61aa 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 c7667b554f4e..c7667b554f4e 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 8a8a004a5e69..8a8a004a5e69 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 c7794b1a8bfb..c7794b1a8bfb 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 3a90a4cdf33e..3a90a4cdf33e 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 4b06c58af5f7..4b06c58af5f7 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 064f04f220cd..064f04f220cd 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 836730228353..836730228353 100644
--- a/pkgs/development/libraries/matio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/matio/default.nix
diff --git a/pkgs/development/libraries/mbedtls/1.3.nix b/nixpkgs/pkgs/development/libraries/mbedtls/1.3.nix
index 8b8d8cd0be80..8b8d8cd0be80 100644
--- a/pkgs/development/libraries/mbedtls/1.3.nix
+++ b/nixpkgs/pkgs/development/libraries/mbedtls/1.3.nix
diff --git a/pkgs/development/libraries/mbedtls/default.nix b/nixpkgs/pkgs/development/libraries/mbedtls/default.nix
index a72d5a825c6a..a72d5a825c6a 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 16502ca4e612..16502ca4e612 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 96c5bc35d169..96c5bc35d169 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 8f0a6317a257..8f0a6317a257 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 4b69d5d0aafe..4b69d5d0aafe 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 b8a8c64011ca..b8a8c64011ca 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 e64bfc5a43a1..e64bfc5a43a1 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 d64b7f123127..d64b7f123127 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 94622b8a8f94..94622b8a8f94 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 2c5e4a8e034e..2c5e4a8e034e 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 1e280b64ee5f..1e280b64ee5f 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 18e7d5437b15..18e7d5437b15 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 fe85d2c90bb2..fe85d2c90bb2 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 5cb6ac3d4d13..5cb6ac3d4d13 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 788d2c5d6188..788d2c5d6188 100644
--- a/pkgs/development/libraries/microsoft_gsl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/microsoft_gsl/default.nix
diff --git a/pkgs/development/libraries/mimetic/default.nix b/nixpkgs/pkgs/development/libraries/mimetic/default.nix
index 7a06f9277c95..7a06f9277c95 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 791cc9f3f911..791cc9f3f911 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 972cc3e738c7..972cc3e738c7 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 c88a978574a7..c88a978574a7 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 d8075c41a703..d8075c41a703 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 85ea7a6292a5..85ea7a6292a5 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 9519e295213b..9519e295213b 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 2a933ef78401..2a933ef78401 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 58905cce82ab..58905cce82ab 100644
--- a/pkgs/development/libraries/mono-addins/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mono-addins/default.nix
diff --git a/pkgs/development/libraries/mono-zeroconf/default.nix b/nixpkgs/pkgs/development/libraries/mono-zeroconf/default.nix
index ba9e2a741e40..ba9e2a741e40 100644
--- a/pkgs/development/libraries/mono-zeroconf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mono-zeroconf/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 84b62dcd4eb0..84b62dcd4eb0 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 801310ba41ce..801310ba41ce 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 d91e43ba2d3c..d91e43ba2d3c 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 51591c9d8e8b..51591c9d8e8b 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 849da2e6cad5..849da2e6cad5 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 51081f25bf2d..51081f25bf2d 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 6b607e94bd49..6b607e94bd49 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 e32c83af8a75..e32c83af8a75 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 1c6b8df15114..1c6b8df15114 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 fe9cd6f492e5..fe9cd6f492e5 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 1430a3dfca15..1430a3dfca15 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 bf51f8954025..bf51f8954025 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 29ec205d7a11..29ec205d7a11 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 e177694e894e..e177694e894e 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 601e70427a13..601e70427a13 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 e999ea73ae2e..e999ea73ae2e 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 ef8525cf54d7..ef8525cf54d7 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 8808ccefeaf1..8808ccefeaf1 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/muparser/default.nix b/nixpkgs/pkgs/development/libraries/muparser/default.nix
index 53f348f93f8e..53f348f93f8e 100644
--- a/pkgs/development/libraries/muparser/default.nix
+++ b/nixpkgs/pkgs/development/libraries/muparser/default.nix
diff --git a/pkgs/development/libraries/mygui/default.nix b/nixpkgs/pkgs/development/libraries/mygui/default.nix
index f4a869255f8c..f4a869255f8c 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 140dbcc937b5..140dbcc937b5 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 6ec288f985b0..6ec288f985b0 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 7779a18fa528..7779a18fa528 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 01bf863bbbb1..01bf863bbbb1 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 f29fb9564f31..f29fb9564f31 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 8f72b333aa48..8f72b333aa48 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 f801e25d91fb..f801e25d91fb 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 ce33049bf405..ce33049bf405 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 708ba46b42eb..708ba46b42eb 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ncurses/default.nix
diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix
index cbe1f9840593..cbe1f9840593 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 913a4a087a97..913a4a087a97 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 65679c7e2825..65679c7e2825 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 87222a9c0ce0..87222a9c0ce0 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 87f9b5effacd..87f9b5effacd 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 61a40753a56f..61a40753a56f 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 a57884912bae..a57884912bae 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 bb621a3eda6c..bb621a3eda6c 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 0c597fc4b335..0c597fc4b335 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 d5036237c8d5..d5036237c8d5 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 900451351c82..900451351c82 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 d78a31d65cd3..d78a31d65cd3 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 60dc00a335d9..60dc00a335d9 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 d6fcfb411491..d6fcfb411491 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 cc5a115ed71e..cc5a115ed71e 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 129cc7ed84c3..129cc7ed84c3 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 e9b89e83907f..e9b89e83907f 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 3c5ae8537a41..3c5ae8537a41 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 43732406064e..43732406064e 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 c02998184fc5..c02998184fc5 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 d7fec73910fb..d7fec73910fb 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 4772f1111aca..4772f1111aca 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 132d5a96b29f..132d5a96b29f 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 c1a65a6c0b28..c1a65a6c0b28 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 f3fc4caf3154..f3fc4caf3154 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 79eb4d1e10e4..79eb4d1e10e4 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 cd1205e2c7d4..cd1205e2c7d4 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 dac65e1c2f9a..dac65e1c2f9a 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 a310d2f27802..a310d2f27802 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 12d3c9ad9420..12d3c9ad9420 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 c0a73fa984e7..c0a73fa984e7 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 806a0178ec8a..806a0178ec8a 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 b667dea8d49f..b667dea8d49f 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 4386542ff20e..4386542ff20e 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 f74030a02df8..f74030a02df8 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 77167361ff20..77167361ff20 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 798f9d3a3965..798f9d3a3965 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 abdc7502052b..abdc7502052b 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 aa1886508609..aa1886508609 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 931ecc186be6..931ecc186be6 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 d847f447048d..d847f447048d 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 42babc32ecdb..42babc32ecdb 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 f1b6060e1663..f1b6060e1663 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 e4045bcd5dc4..e4045bcd5dc4 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 253d185fa0cd..253d185fa0cd 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 49daff30e7b5..49daff30e7b5 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 b54f34fbb2c3..b54f34fbb2c3 100644
--- a/pkgs/development/libraries/oniguruma/default.nix
+++ b/nixpkgs/pkgs/development/libraries/oniguruma/default.nix
diff --git a/pkgs/development/libraries/opae/default.nix b/nixpkgs/pkgs/development/libraries/opae/default.nix
index b60a53e55ca1..b60a53e55ca1 100644
--- a/pkgs/development/libraries/opae/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opae/default.nix
diff --git a/pkgs/development/libraries/opal/default.nix b/nixpkgs/pkgs/development/libraries/opal/default.nix
index dd19fccd822a..dd19fccd822a 100644
--- a/pkgs/development/libraries/opal/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opal/default.nix
diff --git a/pkgs/development/libraries/opal/disable-samples-ftbfs.diff b/nixpkgs/pkgs/development/libraries/opal/disable-samples-ftbfs.diff
index 1b0738216079..1b0738216079 100644
--- a/pkgs/development/libraries/opal/disable-samples-ftbfs.diff
+++ b/nixpkgs/pkgs/development/libraries/opal/disable-samples-ftbfs.diff
diff --git a/pkgs/development/libraries/opal/libav10.patch b/nixpkgs/pkgs/development/libraries/opal/libav10.patch
index 3e02704f8998..3e02704f8998 100644
--- a/pkgs/development/libraries/opal/libav10.patch
+++ b/nixpkgs/pkgs/development/libraries/opal/libav10.patch
diff --git a/pkgs/development/libraries/opal/libav9.patch b/nixpkgs/pkgs/development/libraries/opal/libav9.patch
index f91a8c033fe3..f91a8c033fe3 100644
--- a/pkgs/development/libraries/opal/libav9.patch
+++ b/nixpkgs/pkgs/development/libraries/opal/libav9.patch
diff --git a/pkgs/development/libraries/openal-soft/default.nix b/nixpkgs/pkgs/development/libraries/openal-soft/default.nix
index 3c082926e06c..3c082926e06c 100644
--- a/pkgs/development/libraries/openal-soft/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openal-soft/default.nix
diff --git a/pkgs/development/libraries/openbabel/default.nix b/nixpkgs/pkgs/development/libraries/openbabel/default.nix
index 81754ffad4d2..81754ffad4d2 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 4d3e9e9a04eb..4d3e9e9a04eb 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 77b9e1febddc..77b9e1febddc 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 2b2fc3ff4d5c..2b2fc3ff4d5c 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 83b1cfc2addf..83b1cfc2addf 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 8334bf195f7b..8334bf195f7b 100644
--- a/pkgs/development/libraries/opencascade/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opencascade/default.nix
diff --git a/pkgs/development/libraries/opencl-clhpp/default.nix b/nixpkgs/pkgs/development/libraries/opencl-clhpp/default.nix
index 613aeddd77be..613aeddd77be 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 9ce8bb618bf9..9ce8bb618bf9 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 d3e1482feb4d..d3e1482feb4d 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 39408f5a61e3..39408f5a61e3 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 3081c6c839c8..3081c6c839c8 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 9a8787ad7f49..9a8787ad7f49 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 11c66f0d497b..11c66f0d497b 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 462b44c8f40c..462b44c8f40c 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 5ad7eecace1b..5ad7eecace1b 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 5e78f9f92ecf..5e78f9f92ecf 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 b4ad2bcb8679..b4ad2bcb8679 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 123b8807a74f..123b8807a74f 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 4ee9701583a0..4ee9701583a0 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 f954aaf72457..f954aaf72457 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 17e2c9098a10..17e2c9098a10 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 3d110910b159..3d110910b159 100644
--- a/pkgs/development/libraries/opendkim/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opendkim/default.nix
diff --git a/pkgs/development/libraries/openexr/bootstrap.patch b/nixpkgs/pkgs/development/libraries/openexr/bootstrap.patch
index af6669c16a45..af6669c16a45 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 072848d7bbca..072848d7bbca 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 099bd8d1e973..099bd8d1e973 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 bbbf75b575dc..bbbf75b575dc 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 cd3210dd08b1..cd3210dd08b1 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 42edb1958ce0..42edb1958ce0 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 c8208ce27bae..c8208ce27bae 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 66656a142342..66656a142342 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 dfa5605dec8b..dfa5605dec8b 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 e865e2e8549d..e865e2e8549d 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 6ff720ead4e1..6ff720ead4e1 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 d3130a64b030..d3130a64b030 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 04988debb723..04988debb723 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 17ad9e53005b..17ad9e53005b 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 ed646b9e221b..ed646b9e221b 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 339f60649997..339f60649997 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 659c4fb7cff6..659c4fb7cff6 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/3.4.0.nix b/nixpkgs/pkgs/development/libraries/openscenegraph/3.4.0.nix
index 8d0839041890..8d0839041890 100644
--- a/pkgs/development/libraries/openscenegraph/3.4.0.nix
+++ b/nixpkgs/pkgs/development/libraries/openscenegraph/3.4.0.nix
diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix
index 9f5ef3ff68c8..9f5ef3ff68c8 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 06223deda89b..06223deda89b 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 537b67c5a3c3..537b67c5a3c3 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 5765409fdd57..5765409fdd57 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 3d9ee7e6a822..3d9ee7e6a822 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 813c6bdf44ab..813c6bdf44ab 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 9e871cfb1d31..9e871cfb1d31 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 2c98ccfa7ed0..2c98ccfa7ed0 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 67d199681f96..67d199681f96 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 f07ebad9e810..f07ebad9e810 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 67b903970d3e..67b903970d3e 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 72e532ae7829..72e532ae7829 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 00f4f45df96a..00f4f45df96a 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 af88172c57a1..af88172c57a1 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 a986b71bc1dd..a986b71bc1dd 100644
--- a/pkgs/development/libraries/openwsman/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openwsman/default.nix
diff --git a/pkgs/development/libraries/openzwave/default.nix b/nixpkgs/pkgs/development/libraries/openzwave/default.nix
index 5a5e8ffaef7c..5a5e8ffaef7c 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 fe260e0c2ad2..fe260e0c2ad2 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 b1a52f8fca96..b1a52f8fca96 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 e58e347c7f3e..e58e347c7f3e 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 ce917ccbe7f4..ce917ccbe7f4 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 ba0ed2a9b299..ba0ed2a9b299 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 a1e7215fd9a2..a1e7215fd9a2 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 9ca329c67613..9ca329c67613 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 bc8133aaf822..bc8133aaf822 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 47c6a27639d4..47c6a27639d4 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 b67db91ef642..b67db91ef642 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 6fb123f50949..6fb123f50949 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 064ebf71cc32..064ebf71cc32 100644
--- a/pkgs/development/libraries/pangomm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pangomm/default.nix
diff --git a/pkgs/development/libraries/pangox-compat/default.nix b/nixpkgs/pkgs/development/libraries/pangox-compat/default.nix
index 1ae2f1b81321..1ae2f1b81321 100644
--- a/pkgs/development/libraries/pangox-compat/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pangox-compat/default.nix
diff --git a/pkgs/development/libraries/pangoxsl/default.nix b/nixpkgs/pkgs/development/libraries/pangoxsl/default.nix
index b69ded648397..b69ded648397 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 3fd567ea098f..3fd567ea098f 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 b45ed2966916..b45ed2966916 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 2050e5cdfe79..2050e5cdfe79 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 654698c1b32d..654698c1b32d 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 bfdcdfa7b17e..bfdcdfa7b17e 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 fd2b9feff68b..fd2b9feff68b 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 6d2896ac3396..6d2896ac3396 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 4bc97069b1e2..4bc97069b1e2 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 f080de82ddc2..f080de82ddc2 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 c4cb57f3fa22..c4cb57f3fa22 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 596a3aea6749..596a3aea6749 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 4cc607345e8c..4cc607345e8c 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 39c1b9c0d290..39c1b9c0d290 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 67f343d60380..67f343d60380 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 829ecdb86e06..829ecdb86e06 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 4d68d3718c0a..4d68d3718c0a 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 6edea7f51419..6edea7f51419 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 30b56afb8a95..30b56afb8a95 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 983523e1f2fb..983523e1f2fb 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 e90000efe2db..e90000efe2db 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 1ad5dcb8b25b..1ad5dcb8b25b 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 f01fab74635b..f01fab74635b 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 2d75b6bf0f88..2d75b6bf0f88 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 d83759327760..d83759327760 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/default.nix b/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix
index 3828cfda2aff..3828cfda2aff 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 e3291907d31f..e3291907d31f 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 14e3b8f2fc38..14e3b8f2fc38 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 88f2dc2cd6d4..88f2dc2cd6d4 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 5f51c6a194c7..5f51c6a194c7 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 0b1f3f0490d2..0b1f3f0490d2 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 8abfb461fc0f..8abfb461fc0f 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 0b775d432831..0b775d432831 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/hepmc/default.nix b/nixpkgs/pkgs/development/libraries/physics/hepmc/default.nix
index b935a3d56ea9..b935a3d56ea9 100644
--- a/pkgs/development/libraries/physics/hepmc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/hepmc/default.nix
diff --git a/pkgs/development/libraries/physics/hepmc/in_source.patch b/nixpkgs/pkgs/development/libraries/physics/hepmc/in_source.patch
index 836a56558691..836a56558691 100644
--- a/pkgs/development/libraries/physics/hepmc/in_source.patch
+++ b/nixpkgs/pkgs/development/libraries/physics/hepmc/in_source.patch
diff --git a/pkgs/development/libraries/physics/hepmc3/default.nix b/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix
index c4717800f70d..c4717800f70d 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 7a146bb7309a..7a146bb7309a 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 9c379f6a3474..9c379f6a3474 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 3ad0b3dc4cc1..3ad0b3dc4cc1 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 94bf252ec10a..94bf252ec10a 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 8f693a32e35c..8f693a32e35c 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 c499d370d866..c499d370d866 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 b287e52b2431..b287e52b2431 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 a608a7f6b0f7..a608a7f6b0f7 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 2f79a2b76ab9..2f79a2b76ab9 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 917c57e8cb47..917c57e8cb47 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 e84aaf373255..e84aaf373255 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 620f227250dd..620f227250dd 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 2d397f1da6ca..2d397f1da6ca 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 c8dae0c2b51a..c8dae0c2b51a 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 046413c64f49..046413c64f49 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 08afe6d64522..08afe6d64522 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 cc12cd02a693..cc12cd02a693 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 d3bbb8679746..d3bbb8679746 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 5cf5d34b9aff..5cf5d34b9aff 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 c9e8c632c7f1..c9e8c632c7f1 100644
--- a/pkgs/development/libraries/plib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/plib/default.nix
diff --git a/pkgs/development/libraries/pmdk/default.nix b/nixpkgs/pkgs/development/libraries/pmdk/default.nix
index ceb49fc01538..ceb49fc01538 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 54a563c518fc..54a563c518fc 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 f892540ae5c1..f892540ae5c1 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 4dffa7486a1c..4dffa7486a1c 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 722c1cae8721..722c1cae8721 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 b13335561ac0..b13335561ac0 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 f6cbf7e972b3..f6cbf7e972b3 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 b5b9f1f7fa4d..b5b9f1f7fa4d 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 435b4740a2f7..435b4740a2f7 100644
--- a/pkgs/development/libraries/polkit/system_bus.conf
+++ b/nixpkgs/pkgs/development/libraries/polkit/system_bus.conf
diff --git a/pkgs/development/libraries/poppler/0.61.nix b/nixpkgs/pkgs/development/libraries/poppler/0.61.nix
index 633c3d69618b..633c3d69618b 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 28408cb91f88..28408cb91f88 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 9c084f0b8eaa..9c084f0b8eaa 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 4cfa1c8fb4db..4cfa1c8fb4db 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 592a1f1470a4..592a1f1470a4 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 89248597f5d9..89248597f5d9 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 f790c62f5af2..f790c62f5af2 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 566d88dcdb56..566d88dcdb56 100644
--- a/pkgs/development/libraries/ppl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ppl/default.nix
diff --git a/pkgs/development/libraries/prison/default.nix b/nixpkgs/pkgs/development/libraries/prison/default.nix
index d40b4442e38e..d40b4442e38e 100644
--- a/pkgs/development/libraries/prison/default.nix
+++ b/nixpkgs/pkgs/development/libraries/prison/default.nix
diff --git a/pkgs/development/libraries/proj/default.nix b/nixpkgs/pkgs/development/libraries/proj/default.nix
index 8fb4515e70da..8fb4515e70da 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 6f49db4d206f..6f49db4d206f 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 bd20dc540c06..bd20dc540c06 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 550d0b1bace2..550d0b1bace2 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 91ef87512c84..91ef87512c84 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.6.nix b/nixpkgs/pkgs/development/libraries/protobuf/3.6.nix
index 16decc44e847..16decc44e847 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 9bfb307e3286..9bfb307e3286 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/generic-v3.nix b/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix
index a98521a2d1ee..a98521a2d1ee 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 1a20d806b968..1a20d806b968 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 c3a815c45ac8..c3a815c45ac8 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 e0c5d4db9305..e0c5d4db9305 100644
--- a/pkgs/development/libraries/protobufc/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/protobufc/generic.nix
diff --git a/pkgs/development/libraries/prototypejs/default.nix b/nixpkgs/pkgs/development/libraries/prototypejs/default.nix
index a56b14384e5b..a56b14384e5b 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 a18d768c288c..a18d768c288c 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 270c24dc01f4..270c24dc01f4 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 c61926fe13fa..c61926fe13fa 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 2364e0913bc8..2364e0913bc8 100644
--- a/pkgs/development/libraries/psqlodbc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/psqlodbc/default.nix
diff --git a/pkgs/development/libraries/ptex/default.nix b/nixpkgs/pkgs/development/libraries/ptex/default.nix
index aa17771ec9f2..aa17771ec9f2 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 c315cb8f72b4..c315cb8f72b4 100644
--- a/pkgs/development/libraries/pth/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pth/default.nix
diff --git a/pkgs/development/libraries/ptlib/default.nix b/nixpkgs/pkgs/development/libraries/ptlib/default.nix
index d1dcc5fdb97a..d1dcc5fdb97a 100644
--- a/pkgs/development/libraries/ptlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ptlib/default.nix
diff --git a/pkgs/development/libraries/ptlib/ptlib-2.10.11-glibc-2.26.patch b/nixpkgs/pkgs/development/libraries/ptlib/ptlib-2.10.11-glibc-2.26.patch
index 300c3736abf7..300c3736abf7 100644
--- a/pkgs/development/libraries/ptlib/ptlib-2.10.11-glibc-2.26.patch
+++ b/nixpkgs/pkgs/development/libraries/ptlib/ptlib-2.10.11-glibc-2.26.patch
diff --git a/pkgs/development/libraries/pugixml/default.nix b/nixpkgs/pkgs/development/libraries/pugixml/default.nix
index 74c6e8ef1b30..74c6e8ef1b30 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 b5a01698e5e9..b5a01698e5e9 100644
--- a/pkgs/development/libraries/pupnp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pupnp/default.nix
diff --git a/pkgs/development/libraries/pybind11/default.nix b/nixpkgs/pkgs/development/libraries/pybind11/default.nix
index aa1f8d10ba97..aa1f8d10ba97 100644
--- a/pkgs/development/libraries/pybind11/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pybind11/default.nix
diff --git a/pkgs/development/libraries/pybind11/no_test_cmake_build.patch b/nixpkgs/pkgs/development/libraries/pybind11/no_test_cmake_build.patch
index c5d6ecc4481e..c5d6ecc4481e 100644
--- a/pkgs/development/libraries/pybind11/no_test_cmake_build.patch
+++ b/nixpkgs/pkgs/development/libraries/pybind11/no_test_cmake_build.patch
diff --git a/pkgs/development/libraries/pyotherside/default.nix b/nixpkgs/pkgs/development/libraries/pyotherside/default.nix
index a7f5e03c7380..a7f5e03c7380 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 9f7208909970..9f7208909970 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 4b5b7ace074b..4b5b7ace074b 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 79b105a2d1c8..79b105a2d1c8 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 dcecb83d7db9..dcecb83d7db9 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 ec32c44a91fc..ec32c44a91fc 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 c9b0267f85d8..c9b0267f85d8 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 1fb3a415dc6c..1fb3a415dc6c 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 596dc543e335..596dc543e335 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 51253676341f..51253676341f 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 8692c240f7bb..8692c240f7bb 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 a7077c69dd8d..a7077c69dd8d 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 083e0a51b813..083e0a51b813 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 ba62324d586e..ba62324d586e 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 0d9ae21e87e3..0d9ae21e87e3 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 5bccbf74965a..5bccbf74965a 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 9e8d9ce239bf..9e8d9ce239bf 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 85e45d3fad03..85e45d3fad03 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 43f0e431bb15..43f0e431bb15 100644
--- a/pkgs/development/libraries/qscintilla/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qscintilla/default.nix
diff --git a/pkgs/development/libraries/qt-3/builder.sh b/nixpkgs/pkgs/development/libraries/qt-3/builder.sh
index 460ae17766af..460ae17766af 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 3b3f406485c7..3b3f406485c7 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 763f785726b7..763f785726b7 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 c1a903c130c7..c1a903c130c7 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 db1a2529ff54..db1a2529ff54 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 a0c9fa738898..a0c9fa738898 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 0389c7fdd068..0389c7fdd068 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 7b181f3ad896..7b181f3ad896 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 34ef7463817d..34ef7463817d 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 4c64e9e26e30..4c64e9e26e30 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 a1c9238be1ae..a1c9238be1ae 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 d2ebbf3b45a8..d2ebbf3b45a8 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 4593c1b4ba8d..4593c1b4ba8d 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 c1338e98d851..c1338e98d851 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 5432610d9dc9..5432610d9dc9 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 b9b9d6d0a683..b9b9d6d0a683 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 53a4c70ac3ae..53a4c70ac3ae 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 f288e99dd12a..f288e99dd12a 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 229123c54f76..229123c54f76 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 99a36a24fe43..99a36a24fe43 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 35380ad6714d..35380ad6714d 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 90b9ccda08c9..90b9ccda08c9 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-5/5.11/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.11/default.nix
index f43329d35539..f43329d35539 100644
--- a/pkgs/development/libraries/qt-5/5.11/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.11/default.nix
diff --git a/pkgs/development/libraries/qt-5/5.11/fetch.sh b/nixpkgs/pkgs/development/libraries/qt-5/5.11/fetch.sh
index 2ab3dd71c24f..2ab3dd71c24f 100644
--- a/pkgs/development/libraries/qt-5/5.11/fetch.sh
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.11/fetch.sh
diff --git a/pkgs/development/libraries/qt-5/5.11/qtbase-fixguicmake.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.11/qtbase-fixguicmake.patch
index 8b46d432812a..8b46d432812a 100644
--- a/pkgs/development/libraries/qt-5/5.11/qtbase-fixguicmake.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.11/qtbase-fixguicmake.patch
diff --git a/pkgs/development/libraries/qt-5/5.11/qtbase.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.11/qtbase.patch
index 7d8407f6daf8..7d8407f6daf8 100644
--- a/pkgs/development/libraries/qt-5/5.11/qtbase.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.11/qtbase.patch
diff --git a/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch
index cfa68eb8102c..cfa68eb8102c 100644
--- a/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch
diff --git a/pkgs/development/libraries/qt-5/5.11/qtscript.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.11/qtscript.patch
index 5508dec1280e..5508dec1280e 100644
--- a/pkgs/development/libraries/qt-5/5.11/qtscript.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.11/qtscript.patch
diff --git a/pkgs/development/libraries/qt-5/5.11/qtserialport.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.11/qtserialport.patch
index f25524e80bcf..f25524e80bcf 100644
--- a/pkgs/development/libraries/qt-5/5.11/qtserialport.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.11/qtserialport.patch
diff --git a/pkgs/development/libraries/qt-5/5.11/qttools.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.11/qttools.patch
index 622efc35b6b6..622efc35b6b6 100644
--- a/pkgs/development/libraries/qt-5/5.11/qttools.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.11/qttools.patch
diff --git a/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-no-platform-check.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-no-platform-check.patch
index 3e1a8762b361..3e1a8762b361 100644
--- a/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-no-platform-check.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-no-platform-check.patch
diff --git a/pkgs/development/libraries/qt-5/5.11/qtwebengine-no-build-skip.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.11/qtwebengine-no-build-skip.patch
index f332d5e1bb2b..f332d5e1bb2b 100644
--- a/pkgs/development/libraries/qt-5/5.11/qtwebengine-no-build-skip.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.11/qtwebengine-no-build-skip.patch
diff --git a/pkgs/development/libraries/qt-5/5.11/qtwebkit.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.11/qtwebkit.patch
index b94a4b76cbab..b94a4b76cbab 100644
--- a/pkgs/development/libraries/qt-5/5.11/qtwebkit.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.11/qtwebkit.patch
diff --git a/pkgs/development/libraries/qt-5/5.11/srcs.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.11/srcs.nix
index cff49b180337..cff49b180337 100644
--- a/pkgs/development/libraries/qt-5/5.11/srcs.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.11/srcs.nix
diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix
index 2aa7d0f71ee0..2aa7d0f71ee0 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 aa3a0fe94898..aa3a0fe94898 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-fixguicmake.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase-fixguicmake.patch
index 8b46d432812a..8b46d432812a 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtbase-fixguicmake.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase-fixguicmake.patch
diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase.patch
index aa987acbe92e..aa987acbe92e 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase.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 8f5b5d4790fb..8f5b5d4790fb 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 5508dec1280e..5508dec1280e 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 f25524e80bcf..f25524e80bcf 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 8ae12198ca25..8ae12198ca25 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-CVE-2019-5786.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch
index ec9a432ea708..ec9a432ea708 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.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 364330169bf1..364330169bf1 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 f332d5e1bb2b..f332d5e1bb2b 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 a7087f517623..a7087f517623 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 26d189d86019..26d189d86019 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 b94a4b76cbab..b94a4b76cbab 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 d83edc97e94f..d83edc97e94f 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/5.6/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.6/default.nix
index e493fc169aba..e493fc169aba 100644
--- a/pkgs/development/libraries/qt-5/5.6/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.6/default.nix
diff --git a/pkgs/development/libraries/qt-5/5.6/fetch.sh b/nixpkgs/pkgs/development/libraries/qt-5/5.6/fetch.sh
index bb9eb66a01dc..bb9eb66a01dc 100644
--- a/pkgs/development/libraries/qt-5/5.6/fetch.sh
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.6/fetch.sh
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase-fixguicmake.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.6/qtbase-fixguicmake.patch
index 8b46d432812a..8b46d432812a 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase-fixguicmake.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.6/qtbase-fixguicmake.patch
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.6/qtbase.patch
index d8322cbc1997..d8322cbc1997 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.6/qtbase.patch
diff --git a/pkgs/development/libraries/qt-5/5.6/qtdeclarative.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.6/qtdeclarative.patch
index dbddaa2a1d60..dbddaa2a1d60 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtdeclarative.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.6/qtdeclarative.patch
diff --git a/pkgs/development/libraries/qt-5/5.6/qtscript.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.6/qtscript.patch
index 5508dec1280e..5508dec1280e 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtscript.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.6/qtscript.patch
diff --git a/pkgs/development/libraries/qt-5/5.6/qtserialport.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.6/qtserialport.patch
index b2cffbe4f39b..b2cffbe4f39b 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtserialport.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.6/qtserialport.patch
diff --git a/pkgs/development/libraries/qt-5/5.6/qttools.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.6/qttools.patch
index dcb15e0e55a6..dcb15e0e55a6 100644
--- a/pkgs/development/libraries/qt-5/5.6/qttools.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.6/qttools.patch
diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebengine-seccomp.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.6/qtwebengine-seccomp.patch
index bf6af8059823..bf6af8059823 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtwebengine-seccomp.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.6/qtwebengine-seccomp.patch
diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebkit.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.6/qtwebkit.patch
index da1658554e44..da1658554e44 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtwebkit.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.6/qtwebkit.patch
diff --git a/pkgs/development/libraries/qt-5/5.6/srcs.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.6/srcs.nix
index 87d35a43d86b..87d35a43d86b 100644
--- a/pkgs/development/libraries/qt-5/5.6/srcs.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.6/srcs.nix
diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.9/default.nix
index 9baca8124bd7..9baca8124bd7 100644
--- a/pkgs/development/libraries/qt-5/5.9/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.9/default.nix
diff --git a/pkgs/development/libraries/qt-5/5.9/fetch.sh b/nixpkgs/pkgs/development/libraries/qt-5/5.9/fetch.sh
index 17ebe1e532df..17ebe1e532df 100644
--- a/pkgs/development/libraries/qt-5/5.9/fetch.sh
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.9/fetch.sh
diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase-fixguicmake.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.9/qtbase-fixguicmake.patch
index 8b46d432812a..8b46d432812a 100644
--- a/pkgs/development/libraries/qt-5/5.9/qtbase-fixguicmake.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.9/qtbase-fixguicmake.patch
diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.9/qtbase.patch
index 086ddf4fe3e7..086ddf4fe3e7 100644
--- a/pkgs/development/libraries/qt-5/5.9/qtbase.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.9/qtbase.patch
diff --git a/pkgs/development/libraries/qt-5/5.9/qtdeclarative.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.9/qtdeclarative.patch
index bb1bbbeb05e0..bb1bbbeb05e0 100644
--- a/pkgs/development/libraries/qt-5/5.9/qtdeclarative.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.9/qtdeclarative.patch
diff --git a/pkgs/development/libraries/qt-5/5.9/qtscript.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.9/qtscript.patch
index 5508dec1280e..5508dec1280e 100644
--- a/pkgs/development/libraries/qt-5/5.9/qtscript.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.9/qtscript.patch
diff --git a/pkgs/development/libraries/qt-5/5.9/qtserialport.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.9/qtserialport.patch
index f25524e80bcf..f25524e80bcf 100644
--- a/pkgs/development/libraries/qt-5/5.9/qtserialport.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.9/qtserialport.patch
diff --git a/pkgs/development/libraries/qt-5/5.9/qttools.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.9/qttools.patch
index fbba439ef7a5..fbba439ef7a5 100644
--- a/pkgs/development/libraries/qt-5/5.9/qttools.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.9/qttools.patch
diff --git a/pkgs/development/libraries/qt-5/5.9/qtwebengine-clang-fix.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.9/qtwebengine-clang-fix.patch
index cf082cddd11a..cf082cddd11a 100644
--- a/pkgs/development/libraries/qt-5/5.9/qtwebengine-clang-fix.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.9/qtwebengine-clang-fix.patch
diff --git a/pkgs/development/libraries/qt-5/5.9/qtwebengine-darwin-no-platform-check.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.9/qtwebengine-darwin-no-platform-check.patch
index 7156c41c5ec1..7156c41c5ec1 100644
--- a/pkgs/development/libraries/qt-5/5.9/qtwebengine-darwin-no-platform-check.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.9/qtwebengine-darwin-no-platform-check.patch
diff --git a/pkgs/development/libraries/qt-5/5.9/qtwebengine-no-build-skip.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.9/qtwebengine-no-build-skip.patch
index f332d5e1bb2b..f332d5e1bb2b 100644
--- a/pkgs/development/libraries/qt-5/5.9/qtwebengine-no-build-skip.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.9/qtwebengine-no-build-skip.patch
diff --git a/pkgs/development/libraries/qt-5/5.9/qtwebkit.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.9/qtwebkit.patch
index 718bda361943..718bda361943 100644
--- a/pkgs/development/libraries/qt-5/5.9/qtwebkit.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.9/qtwebkit.patch
diff --git a/pkgs/development/libraries/qt-5/5.9/srcs.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.9/srcs.nix
index 09b6293daebc..09b6293daebc 100644
--- a/pkgs/development/libraries/qt-5/5.9/srcs.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.9/srcs.nix
diff --git a/pkgs/development/libraries/qt-5/README.md b/nixpkgs/pkgs/development/libraries/qt-5/README.md
index b2ef74d0aef1..b2ef74d0aef1 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-qt-builtin-paths.sh b/nixpkgs/pkgs/development/libraries/qt-5/hooks/fix-qt-builtin-paths.sh
index 4ca11a223de2..4ca11a223de2 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 33682f6f3c69..33682f6f3c69 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 85489c85105b..85489c85105b 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 eef2c7d24dfc..eef2c7d24dfc 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 3a558153988c..3a558153988c 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 b09cf5f46c9c..b09cf5f46c9c 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/mkDerivation.nix b/nixpkgs/pkgs/development/libraries/qt-5/mkDerivation.nix
index d4e2143d564b..d4e2143d564b 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 2c050a105b85..2c050a105b85 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 84d3a17ea8ce..84d3a17ea8ce 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 17e7f0ee7cff..17e7f0ee7cff 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 7c1fa449ebba..7c1fa449ebba 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 10623962c430..10623962c430 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 d0be6ae77694..d0be6ae77694 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 1a7726070be3..1a7726070be3 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 0eee684a53fd..0eee684a53fd 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 3f254885986e..3f254885986e 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 d0bab88b2f21..d0bab88b2f21 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 e6ef428cc3c4..e6ef428cc3c4 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 ba0f20bc0d83..ba0f20bc0d83 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 a9522f4b1f0c..a9522f4b1f0c 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 5a1a462a9640..5a1a462a9640 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 3b8732b68851..3b8732b68851 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 516d38340dc5..516d38340dc5 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 7b4b19ccab5a..7b4b19ccab5a 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 3ce68e56e412..3ce68e56e412 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 573472a8b5ab..573472a8b5ab 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 11a6e3fedcb1..11a6e3fedcb1 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 2ba720c8eedc..2ba720c8eedc 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 c7a7704f2837..c7a7704f2837 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 84fb88385a3e..84fb88385a3e 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 aa9cdb4d5ae7..aa9cdb4d5ae7 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 444d0c1beae8..444d0c1beae8 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 40f4c56e8091..40f4c56e8091 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 ad5e7625f289..ad5e7625f289 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 6d5274cbc586..6d5274cbc586 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 4d431fee278b..4d431fee278b 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 7ac922421f08..7ac922421f08 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 da56c07779b9..da56c07779b9 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 84a9d30918b1..84a9d30918b1 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 ae99035d2267..ae99035d2267 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 1578593b8aea..1578593b8aea 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 4cd7214e61e2..4cd7214e61e2 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/default.nix b/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix
index 3de84d859111..3de84d859111 100644
--- a/pkgs/development/libraries/qtkeychain/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix
diff --git a/pkgs/development/libraries/qtscriptgenerator/default.nix b/nixpkgs/pkgs/development/libraries/qtscriptgenerator/default.nix
index 88591e880dee..88591e880dee 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 8fe643e2c98f..8fe643e2c98f 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 c0a710efb157..c0a710efb157 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 88330712dcd4..88330712dcd4 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 dc11cb560910..dc11cb560910 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 b94cdd22f7f0..b94cdd22f7f0 100644
--- a/pkgs/development/libraries/qtstyleplugins/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix
diff --git a/pkgs/development/libraries/qtwebkit-plugins/default.nix b/nixpkgs/pkgs/development/libraries/qtwebkit-plugins/default.nix
index 46a9785739a6..46a9785739a6 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 cac861fe2248..cac861fe2248 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 84be9876c1cb..84be9876c1cb 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 35d16ee5e19b..35d16ee5e19b 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 6e0fa53aa828..6e0fa53aa828 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 b6e0acb603d3..b6e0acb603d3 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 f900de5e578b..f900de5e578b 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 5ed05ec6b322..5ed05ec6b322 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 286c5c868dff..286c5c868dff 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 96a2347c50fa..96a2347c50fa 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/range-v3/default.nix b/nixpkgs/pkgs/development/libraries/range-v3/default.nix
index 256b756ed45d..256b756ed45d 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 9d8ce8cef202..9d8ce8cef202 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 a1671aa3e0f9..a1671aa3e0f9 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 99f880916907..99f880916907 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 bd79e3628a14..bd79e3628a14 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 9f4fe54e8056..9f4fe54e8056 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 a6a5fbed4fc5..a6a5fbed4fc5 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 84062408d45c..84062408d45c 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 54aa42439d97..54aa42439d97 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 f9a20a535cb3..f9a20a535cb3 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 e96b4f1ebe27..e96b4f1ebe27 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 eefef9727663..eefef9727663 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 7e81774be369..7e81774be369 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 42bb0be09c39..42bb0be09c39 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 0fd0598f4650..0fd0598f4650 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 7c46dbad962a..7c46dbad962a 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 b23eab5d9d73..b23eab5d9d73 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 9fdcb3743b72..9fdcb3743b72 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 d0aaaf38f706..d0aaaf38f706 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 c34ef2bf97bb..c34ef2bf97bb 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 b8019fb33502..b8019fb33502 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 a9199ca3e89a..a9199ca3e89a 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 1c777e849a46..1c777e849a46 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 681fc3a012fe..681fc3a012fe 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 4d875b693304..4d875b693304 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 e221c82edeca..e221c82edeca 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 f8268b5eb7cd..f8268b5eb7cd 100644
--- a/pkgs/development/libraries/rlog/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rlog/default.nix
diff --git a/pkgs/development/libraries/robin-map/default.nix b/nixpkgs/pkgs/development/libraries/robin-map/default.nix
index 87c855251e0f..87c855251e0f 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/0001-findzlib.patch b/nixpkgs/pkgs/development/libraries/rocksdb/0001-findzlib.patch
index eb532620773e..eb532620773e 100644
--- a/pkgs/development/libraries/rocksdb/0001-findzlib.patch
+++ b/nixpkgs/pkgs/development/libraries/rocksdb/0001-findzlib.patch
diff --git a/pkgs/development/libraries/rocksdb/default.nix b/nixpkgs/pkgs/development/libraries/rocksdb/default.nix
index bd6441eeb0ee..bd6441eeb0ee 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 195db9a16858..195db9a16858 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 74b8e381f931..74b8e381f931 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 c9ba339ae0ea..c9ba339ae0ea 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 daa499061c5b..daa499061c5b 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 ce8db3ee9ea9..ce8db3ee9ea9 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 ba0b8f4e996f..ba0b8f4e996f 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 25126edbc0f4..25126edbc0f4 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 f727728943bd..f727728943bd 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 f4353f51d66c..f4353f51d66c 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 3c9b8f8257ce..3c9b8f8257ce 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 0c634c0f265c..0c634c0f265c 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 5f4cbbaa5670..5f4cbbaa5670 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 2ee9144b316d..2ee9144b316d 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 22bcc56c82ab..22bcc56c82ab 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 51eed36312dd..51eed36312dd 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 8755b7fd2eba..8755b7fd2eba 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 4668839ebb9c..4668839ebb9c 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 05373cd1cbda..05373cd1cbda 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 286be260052b..286be260052b 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 16850fb1665e..16850fb1665e 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 d568e9452021..d568e9452021 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 f319f20233a2..f319f20233a2 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 d908cb6ba80b..d908cb6ba80b 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 537fcb93a87e..537fcb93a87e 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 40dbfc53e2cb..40dbfc53e2cb 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 87404a426a4b..87404a426a4b 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 2441aff9fa30..2441aff9fa30 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/cudnn/default.nix b/nixpkgs/pkgs/development/libraries/science/math/cudnn/default.nix
index a33e3ec20096..a33e3ec20096 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 3c448abeccf6..3c448abeccf6 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 645a865eb955..645a865eb955 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 4ae5ea522555..4ae5ea522555 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 2ef2709263ab..2ef2709263ab 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 2891429c8578..2891429c8578 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 30453086d457..30453086d457 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 51fbd9f14cb4..51fbd9f14cb4 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 f55bbe3f24fa..f55bbe3f24fa 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 be650f3c3ce8..be650f3c3ce8 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 e96ee475d7d2..e96ee475d7d2 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 46538d0022e7..46538d0022e7 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 33e8baada834..33e8baada834 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 3cf5c3619a9e..3cf5c3619a9e 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 b9ee1e2a10d7..b9ee1e2a10d7 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 23fc03655cf3..23fc03655cf3 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 8444d88809af..8444d88809af 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 3ce94f28ac2a..3ce94f28ac2a 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 2dcac58bf6ca..2dcac58bf6ca 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 a099b779a781..a099b779a781 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 d967bbf8c3e1..d967bbf8c3e1 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 01b0faf89f90..01b0faf89f90 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 3a4c5a784385..3a4c5a784385 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/default.nix b/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix
index ba6827bf6947..ba6827bf6947 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/osi/default.nix b/nixpkgs/pkgs/development/libraries/science/math/osi/default.nix
index 1cc80e78a100..1cc80e78a100 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 ca35ce2f4134..ca35ce2f4134 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 ac8129c9032f..ac8129c9032f 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 7394fb9e1b41..7394fb9e1b41 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 3eee63dbf4f6..3eee63dbf4f6 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 fda54fe44ab1..fda54fe44ab1 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 624885c501aa..624885c501aa 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 b4c6574d13a6..b4c6574d13a6 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/scalapack/openmpi4.patch b/nixpkgs/pkgs/development/libraries/science/math/scalapack/openmpi4.patch
index 5d0afb58c027..5d0afb58c027 100644
--- a/pkgs/development/libraries/science/math/scalapack/openmpi4.patch
+++ b/nixpkgs/pkgs/development/libraries/science/math/scalapack/openmpi4.patch
diff --git a/pkgs/development/libraries/science/math/scs/default.nix b/nixpkgs/pkgs/development/libraries/science/math/scs/default.nix
index f9d1a84b1f03..f9d1a84b1f03 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/suitesparse/4.2.nix b/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.2.nix
index 7e71eafef697..7e71eafef697 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 1ce56d1e49f7..1ce56d1e49f7 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 a6c803be260a..a6c803be260a 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 29d86238af08..29d86238af08 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 9938a3096a02..9938a3096a02 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 ce7bc6974c95..ce7bc6974c95 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 080cab86ca4b..080cab86ca4b 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/zn_poly/default.nix b/nixpkgs/pkgs/development/libraries/science/math/zn_poly/default.nix
index ad4d4c017376..ad4d4c017376 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/ns3/default.nix b/nixpkgs/pkgs/development/libraries/science/networking/ns3/default.nix
index 5218de075093..5218de075093 100644
--- a/pkgs/development/libraries/science/networking/ns3/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/networking/ns3/default.nix
diff --git a/pkgs/development/libraries/science/robotics/ispike/default.nix b/nixpkgs/pkgs/development/libraries/science/robotics/ispike/default.nix
index 5f2263d821d0..5f2263d821d0 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 c9c26ca0d66c..c9c26ca0d66c 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 ba291dc97ff2..ba291dc97ff2 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 116f248b3b4e..116f248b3b4e 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 f81eb9b259e8..f81eb9b259e8 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 c6bb2afc2705..c6bb2afc2705 100644
--- a/pkgs/development/libraries/seasocks/default.nix
+++ b/nixpkgs/pkgs/development/libraries/seasocks/default.nix
diff --git a/pkgs/development/libraries/serd/default.nix b/nixpkgs/pkgs/development/libraries/serd/default.nix
index 533fefa9f194..533fefa9f194 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 3fd47125bcb3..3fd47125bcb3 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 a7eefe7d5c1f..a7eefe7d5c1f 100644
--- a/pkgs/development/libraries/serf/scons.patch
+++ b/nixpkgs/pkgs/development/libraries/serf/scons.patch
diff --git a/pkgs/development/libraries/sfml/default.nix b/nixpkgs/pkgs/development/libraries/sfml/default.nix
index 8e1b9ae394b5..8e1b9ae394b5 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 1e9a8ba6a58b..1e9a8ba6a58b 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 9da54a370425..9da54a370425 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 5f14a7bb5ee5..5f14a7bb5ee5 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 dbac4c859619..dbac4c859619 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 74f861297d1a..74f861297d1a 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 9d0aca0ab14b..9d0aca0ab14b 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 f795dfef9e4c..f795dfef9e4c 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 7929c1967c82..7929c1967c82 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 11612eeb2884..11612eeb2884 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 90dfe8ebfab8..90dfe8ebfab8 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 c885f00a33c5..c885f00a33c5 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 f868f6bd4947..f868f6bd4947 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 2229b759a3d4..2229b759a3d4 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 9b803a35fbdd..9b803a35fbdd 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 665f025ffcf3..665f025ffcf3 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 3c7e91e81886..3c7e91e81886 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 941e75b8ba92..941e75b8ba92 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 66bfd601a62d..66bfd601a62d 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 529f910c35ae..529f910c35ae 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 35d5075a949a..35d5075a949a 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 8486dee5cda4..8486dee5cda4 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 165feb4428c2..165feb4428c2 100644
--- a/pkgs/development/libraries/smpeg/gcc6.patch
+++ b/nixpkgs/pkgs/development/libraries/smpeg/gcc6.patch
diff --git a/pkgs/development/libraries/smpeg2/default.nix b/nixpkgs/pkgs/development/libraries/smpeg2/default.nix
index 900437864717..900437864717 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 165feb4428c2..165feb4428c2 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 63bc352976ec..63bc352976ec 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 acf10cc497c8..acf10cc497c8 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 36077d71126a..36077d71126a 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 c891c13fe74c..c891c13fe74c 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 2903e79f8910..2903e79f8910 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 ca2ff666b7a5..ca2ff666b7a5 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 2f3ec44a08ce..2f3ec44a08ce 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 48ee1af0e30d..48ee1af0e30d 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 4739c7363979..4739c7363979 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 95a2c7e96565..95a2c7e96565 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 98226ce20f4a..98226ce20f4a 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 10258e791ba6..10258e791ba6 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 95a97f30b6e6..95a97f30b6e6 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 50ba9c944ab5..50ba9c944ab5 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 be2fc503e390..be2fc503e390 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 f898152d820e..f898152d820e 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 2708e49eb2b6..2708e49eb2b6 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 cab0e69ad1a7..cab0e69ad1a7 100644
--- a/pkgs/development/libraries/spdk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/spdk/default.nix
diff --git a/pkgs/development/libraries/spdlog/default.nix b/nixpkgs/pkgs/development/libraries/spdlog/default.nix
index c746925150bb..c746925150bb 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 771ad033ed91..771ad033ed91 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 b27fd0843bc0..b27fd0843bc0 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 7bf3a5faa7d1..7bf3a5faa7d1 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 13cd5e7d21a5..13cd5e7d21a5 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 4d74c7e05598..4d74c7e05598 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 57c3ae40fd97..57c3ae40fd97 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 079d61ca3d58..079d61ca3d58 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 c32f336939cb..c32f336939cb 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 d3422cb915b3..d3422cb915b3 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 d2c4ddb8631e..d2c4ddb8631e 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 40d272fd07d6..40d272fd07d6 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 6cf8d97cb67c..6cf8d97cb67c 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 f0390486b10e..f0390486b10e 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 1f312ecef23a..1f312ecef23a 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 ea1c38ea476b..ea1c38ea476b 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 e5d322330e8e..e5d322330e8e 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 bb66174c8841..bb66174c8841 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 c9073fc0b7e7..c9073fc0b7e7 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 fc771a493b6d..fc771a493b6d 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 4f36ac2ba1c7..4f36ac2ba1c7 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 89261b665f50..89261b665f50 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 ff1a7b57f4a5..ff1a7b57f4a5 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 36768acd991a..36768acd991a 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 4c6b34fe1bec..4c6b34fe1bec 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 b46f6c52b823..b46f6c52b823 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 2244803f4d32..2244803f4d32 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 35bacff0525a..35bacff0525a 100644
--- a/pkgs/development/libraries/subunit/default.nix
+++ b/nixpkgs/pkgs/development/libraries/subunit/default.nix
diff --git a/pkgs/development/libraries/sundials/default.nix b/nixpkgs/pkgs/development/libraries/sundials/default.nix
index abe444c63c32..abe444c63c32 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 2e6e2d3fbbfd..2e6e2d3fbbfd 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 c83f5b0f5ac3..c83f5b0f5ac3 100644
--- a/pkgs/development/libraries/swiften/default.nix
+++ b/nixpkgs/pkgs/development/libraries/swiften/default.nix
diff --git a/pkgs/development/libraries/sword/default.nix b/nixpkgs/pkgs/development/libraries/sword/default.nix
index a8a110cf9b14..a8a110cf9b14 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 40e1a280aa24..40e1a280aa24 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 6577ebeae28e..6577ebeae28e 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 b8e7518cd332..b8e7518cd332 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 dbede586f073..dbede586f073 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 27ac0fdd5ff9..27ac0fdd5ff9 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 cf83f8c8c31c..cf83f8c8c31c 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 faa3810fb5c6..faa3810fb5c6 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 b667e6047400..b667e6047400 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 86006806baa0..86006806baa0 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/1.9.nix b/nixpkgs/pkgs/development/libraries/taglib/1.9.nix
index 8992c7e75c05..8992c7e75c05 100644
--- a/pkgs/development/libraries/taglib/1.9.nix
+++ b/nixpkgs/pkgs/development/libraries/taglib/1.9.nix
diff --git a/pkgs/development/libraries/taglib/default.nix b/nixpkgs/pkgs/development/libraries/taglib/default.nix
index a2cb103a1821..a2cb103a1821 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 5a8ebe84ba69..5a8ebe84ba69 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 89b163a0917c..89b163a0917c 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 64056ecb1462..64056ecb1462 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 293baa492c56..293baa492c56 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 24b1d477b8a0..24b1d477b8a0 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 4e1f0bcab035..4e1f0bcab035 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 1cb063773998..1cb063773998 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 4df80140aa5d..4df80140aa5d 100644
--- a/pkgs/development/libraries/tdb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tdb/default.nix
diff --git a/pkgs/development/libraries/tecla/default.nix b/nixpkgs/pkgs/development/libraries/tecla/default.nix
index e835d1d86fdc..e835d1d86fdc 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 1247d9ffa843..1247d9ffa843 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 7436da503190..7436da503190 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 d14010c857e4..d14010c857e4 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 4314abd2548a..4314abd2548a 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 0ca382baeca3..0ca382baeca3 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 eefc976a62b0..eefc976a62b0 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 9f94f4f7217d..9f94f4f7217d 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 8d72d9a7d8ec..8d72d9a7d8ec 100644
--- a/pkgs/development/libraries/theft/default.nix
+++ b/nixpkgs/pkgs/development/libraries/theft/default.nix
diff --git a/pkgs/development/libraries/thrift/default.nix b/nixpkgs/pkgs/development/libraries/thrift/default.nix
index 92cc76273ba1..92cc76273ba1 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 d67d76185745..d67d76185745 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 e46bf2418bcf..e46bf2418bcf 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 51dabbd2beb7..51dabbd2beb7 100644
--- a/pkgs/development/libraries/tidyp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tidyp/default.nix
diff --git a/pkgs/development/libraries/tinyxml-2/default.nix b/nixpkgs/pkgs/development/libraries/tinyxml-2/default.nix
index 7f1b3ebcbf5b..7f1b3ebcbf5b 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 ca89685a458f..ca89685a458f 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 e55d0be43bcc..e55d0be43bcc 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 3164261291ba..3164261291ba 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 d61076e569bc..d61076e569bc 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 232c95e6257e..232c95e6257e 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 141f6da14ce4..141f6da14ce4 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 5013db64bbae..5013db64bbae 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 528a75e1c91f..528a75e1c91f 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 aee46e149b1a..aee46e149b1a 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 be09bb73b3aa..be09bb73b3aa 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 229e4cfaa6c0..229e4cfaa6c0 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 9edfcc88f164..9edfcc88f164 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 aaff759525b6..aaff759525b6 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 b8969588b3c5..b8969588b3c5 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 7bf08a3560ae..7bf08a3560ae 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 e5803d644f3b..e5803d644f3b 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 d4c61890afb1..d4c61890afb1 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 dd8a300d70f4..dd8a300d70f4 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 cb1052356786..cb1052356786 100644
--- a/pkgs/development/libraries/tpm2-tss/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix
diff --git a/pkgs/development/libraries/tre/default.nix b/nixpkgs/pkgs/development/libraries/tre/default.nix
index 901b6aa097fd..901b6aa097fd 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 5609f1d67d17..5609f1d67d17 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 552bd4c1c51d..552bd4c1c51d 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 bcc91d058f04..bcc91d058f04 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 2bfeb9f779ca..2bfeb9f779ca 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 a752da8cb57d..a752da8cb57d 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 933a3afef35b..933a3afef35b 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 53e10b468ba6..53e10b468ba6 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 9c899eb21ba7..9c899eb21ba7 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 664bc29a72de..664bc29a72de 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 6eef95309aab..6eef95309aab 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 bd9fb796247d..bd9fb796247d 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 07892e970875..07892e970875 100644
--- a/pkgs/development/libraries/umockdev/default.nix
+++ b/nixpkgs/pkgs/development/libraries/umockdev/default.nix
diff --git a/pkgs/development/libraries/unibilium/default.nix b/nixpkgs/pkgs/development/libraries/unibilium/default.nix
index 717edda18a2b..717edda18a2b 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 1aa5e6717021..1aa5e6717021 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 aa4a7890b23e..aa4a7890b23e 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 90a28df6a15a..90a28df6a15a 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 1275df69f596..1275df69f596 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 7b72e12a66b2..7b72e12a66b2 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 46eac0fb88bb..46eac0fb88bb 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 89efdc006a54..89efdc006a54 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 3d09545c9317..3d09545c9317 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 c15259c585ad..c15259c585ad 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 f75b537485d8..f75b537485d8 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 91bf7e393784..91bf7e393784 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 b80984303d76..b80984303d76 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 16d4a8fa40b5..16d4a8fa40b5 100644
--- a/pkgs/development/libraries/utmps/default.nix
+++ b/nixpkgs/pkgs/development/libraries/utmps/default.nix
diff --git a/pkgs/development/libraries/v8/3.14.nix b/nixpkgs/pkgs/development/libraries/v8/3.14.nix
index 827274251ed9..827274251ed9 100644
--- a/pkgs/development/libraries/v8/3.14.nix
+++ b/nixpkgs/pkgs/development/libraries/v8/3.14.nix
diff --git a/pkgs/development/libraries/v8/3.16.14.nix b/nixpkgs/pkgs/development/libraries/v8/3.16.14.nix
index a7dddd141246..a7dddd141246 100644
--- a/pkgs/development/libraries/v8/3.16.14.nix
+++ b/nixpkgs/pkgs/development/libraries/v8/3.16.14.nix
diff --git a/pkgs/development/libraries/v8/5_x.nix b/nixpkgs/pkgs/development/libraries/v8/5_x.nix
index 2b9fa5cc04c0..2b9fa5cc04c0 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 629d5e4dc392..629d5e4dc392 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 f7c4f34e8e6e..f7c4f34e8e6e 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 16c227cfe38d..16c227cfe38d 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 8d2276def705..8d2276def705 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 f046bb8e6885..f046bb8e6885 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 56ded2c56447..56ded2c56447 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 640f50eb45bf..640f50eb45bf 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 07ca9d2e62e1..07ca9d2e62e1 100644
--- a/pkgs/development/libraries/vaapi-vdpau/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vaapi-vdpau/default.nix
diff --git a/pkgs/development/libraries/vaapi-vdpau/glext85.patch b/nixpkgs/pkgs/development/libraries/vaapi-vdpau/glext85.patch
index 073b8cf11904..073b8cf11904 100644
--- a/pkgs/development/libraries/vaapi-vdpau/glext85.patch
+++ b/nixpkgs/pkgs/development/libraries/vaapi-vdpau/glext85.patch
diff --git a/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/nixpkgs/pkgs/development/libraries/vapoursynth-mvtools/default.nix
index abdf9fbeed3c..abdf9fbeed3c 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 65132806d883..65132806d883 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 3853718c1541..3853718c1541 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 1af70056d2eb..1af70056d2eb 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 66c8e4fbc531..66c8e4fbc531 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 480b8f7bcd7b..480b8f7bcd7b 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 b7249c8ee82c..b7249c8ee82c 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 e516c94866a2..e516c94866a2 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 fb69d4bf63e7..fb69d4bf63e7 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 72803e09f075..72803e09f075 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 e0398487abc3..e0398487abc3 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 18b9278539fc..18b9278539fc 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 8b9a7983a928..8b9a7983a928 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 1a900c3135ca..1a900c3135ca 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 f6669f2f8fea..f6669f2f8fea 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 4f72cc138acf..4f72cc138acf 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 eda88e751843..eda88e751843 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 43429255e8cd..43429255e8cd 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 0ae5ba147cb7..0ae5ba147cb7 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 e706c730ddd3..e706c730ddd3 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 f4e8c128ccbf..f4e8c128ccbf 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 273072e93239..273072e93239 100644
--- a/pkgs/development/libraries/vte/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vte/default.nix
diff --git a/pkgs/development/libraries/vte/ng.nix b/nixpkgs/pkgs/development/libraries/vte/ng.nix
index c00be4c008f7..c00be4c008f7 100644
--- a/pkgs/development/libraries/vte/ng.nix
+++ b/nixpkgs/pkgs/development/libraries/vte/ng.nix
diff --git a/pkgs/development/libraries/vtk/default.nix b/nixpkgs/pkgs/development/libraries/vtk/default.nix
index 9843b1289cfc..9843b1289cfc 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 f7c1bf9a65b9..f7c1bf9a65b9 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 a44e91e1bf5c..a44e91e1bf5c 100644
--- a/pkgs/development/libraries/vulkan-loader/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix
diff --git a/pkgs/development/libraries/vulkan-loader/system-search-path.patch b/nixpkgs/pkgs/development/libraries/vulkan-loader/system-search-path.patch
index 26f83e6d534f..26f83e6d534f 100644
--- a/pkgs/development/libraries/vulkan-loader/system-search-path.patch
+++ b/nixpkgs/pkgs/development/libraries/vulkan-loader/system-search-path.patch
diff --git a/pkgs/development/libraries/vxl/default.nix b/nixpkgs/pkgs/development/libraries/vxl/default.nix
index 9651e9a5f80c..9651e9a5f80c 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 229d67b81edd..229d67b81edd 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 9eb3254001d5..9eb3254001d5 100644
--- a/pkgs/development/libraries/wavpack/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wavpack/default.nix
diff --git a/pkgs/development/libraries/wayland/1.9.nix b/nixpkgs/pkgs/development/libraries/wayland/1.9.nix
index 3fda417d8e1f..3fda417d8e1f 100644
--- a/pkgs/development/libraries/wayland/1.9.nix
+++ b/nixpkgs/pkgs/development/libraries/wayland/1.9.nix
diff --git a/pkgs/development/libraries/wayland/default.nix b/nixpkgs/pkgs/development/libraries/wayland/default.nix
index 60d240552d4f..60d240552d4f 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 b14dc03385cf..b14dc03385cf 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 4fd94a29f9cd..4fd94a29f9cd 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 187eed6ae83a..187eed6ae83a 100644
--- a/pkgs/development/libraries/wcslib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wcslib/default.nix
diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/nixpkgs/pkgs/development/libraries/webkitgtk/2.4.nix
index 04758ace7fa4..04758ace7fa4 100644
--- a/pkgs/development/libraries/webkitgtk/2.4.nix
+++ b/nixpkgs/pkgs/development/libraries/webkitgtk/2.4.nix
diff --git a/pkgs/development/libraries/webkitgtk/configure.patch b/nixpkgs/pkgs/development/libraries/webkitgtk/configure.patch
index 2f4c1e7ad314..2f4c1e7ad314 100644
--- a/pkgs/development/libraries/webkitgtk/configure.patch
+++ b/nixpkgs/pkgs/development/libraries/webkitgtk/configure.patch
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix
index 91848ce1fb6b..91848ce1fb6b 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix
diff --git a/pkgs/development/libraries/webkitgtk/fix-execinfo.patch b/nixpkgs/pkgs/development/libraries/webkitgtk/fix-execinfo.patch
index eb825312f3be..eb825312f3be 100644
--- a/pkgs/development/libraries/webkitgtk/fix-execinfo.patch
+++ b/nixpkgs/pkgs/development/libraries/webkitgtk/fix-execinfo.patch
diff --git a/pkgs/development/libraries/webkitgtk/libc++.patch b/nixpkgs/pkgs/development/libraries/webkitgtk/libc++.patch
index 5a9df0ddae98..5a9df0ddae98 100644
--- a/pkgs/development/libraries/webkitgtk/libc++.patch
+++ b/nixpkgs/pkgs/development/libraries/webkitgtk/libc++.patch
diff --git a/pkgs/development/libraries/webkitgtk/plugin-none.patch b/nixpkgs/pkgs/development/libraries/webkitgtk/plugin-none.patch
index 5e2b36bf62dd..5e2b36bf62dd 100644
--- a/pkgs/development/libraries/webkitgtk/plugin-none.patch
+++ b/nixpkgs/pkgs/development/libraries/webkitgtk/plugin-none.patch
diff --git a/pkgs/development/libraries/webkitgtk/quartz-webcore.patch b/nixpkgs/pkgs/development/libraries/webkitgtk/quartz-webcore.patch
index a7bf859d6c62..a7bf859d6c62 100644
--- a/pkgs/development/libraries/webkitgtk/quartz-webcore.patch
+++ b/nixpkgs/pkgs/development/libraries/webkitgtk/quartz-webcore.patch
diff --git a/pkgs/development/libraries/webkitgtk/webcore-svg-libxml-cflags.patch b/nixpkgs/pkgs/development/libraries/webkitgtk/webcore-svg-libxml-cflags.patch
index 03fc3f3f97de..03fc3f3f97de 100644
--- a/pkgs/development/libraries/webkitgtk/webcore-svg-libxml-cflags.patch
+++ b/nixpkgs/pkgs/development/libraries/webkitgtk/webcore-svg-libxml-cflags.patch
diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix
index b22d339617c2..b22d339617c2 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 d84f30aad55b..d84f30aad55b 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 3b0a447f7376..3b0a447f7376 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 c45f521dcbb0..c45f521dcbb0 100644
--- a/pkgs/development/libraries/wiredtiger/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wiredtiger/default.nix
diff --git a/pkgs/development/libraries/wlc/default.nix b/nixpkgs/pkgs/development/libraries/wlc/default.nix
index 3f2891ffd510..3f2891ffd510 100644
--- a/pkgs/development/libraries/wlc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wlc/default.nix
diff --git a/pkgs/development/libraries/wlroots/default.nix b/nixpkgs/pkgs/development/libraries/wlroots/default.nix
index b85616842ea6..b85616842ea6 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 e7feaabc739a..e7feaabc739a 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 e1c339d1e0fe..e1c339d1e0fe 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 86f2719537cd..86f2719537cd 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 2791c97f5ae6..2791c97f5ae6 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 bd2442a323a6..bd2442a323a6 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 49f12842533b..49f12842533b 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 998f6a9e5f69..998f6a9e5f69 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 b952e8b12673..b952e8b12673 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 369d011f9b3c..369d011f9b3c 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 b33b0b15331a..b33b0b15331a 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 7a32aba24ff8..7a32aba24ff8 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 cee967ef2aa0..cee967ef2aa0 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 9998add0d930..9998add0d930 100644
--- a/pkgs/development/libraries/x264/default.nix
+++ b/nixpkgs/pkgs/development/libraries/x264/default.nix
diff --git a/pkgs/development/libraries/x265/default.nix b/nixpkgs/pkgs/development/libraries/x265/default.nix
index 398c309d938d..398c309d938d 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 aeb741dbae7b..aeb741dbae7b 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 c10dfdaa961c..c10dfdaa961c 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 72a7c3e721f4..72a7c3e721f4 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 1203f19d6c82..1203f19d6c82 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 31c31164e010..31c31164e010 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 3dd2cb5b874c..3dd2cb5b874c 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 a23658049b98..a23658049b98 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 e343c301127f..e343c301127f 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 e22b50fd9fdc..e22b50fd9fdc 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 f9463d37fcaa..f9463d37fcaa 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 a3ddce4a706f..a3ddce4a706f 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 d1605aac3342..d1605aac3342 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 b8cf86999e0b..b8cf86999e0b 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 3f02946c7704..3f02946c7704 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 f4b103eb38b1..f4b103eb38b1 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 f884899ecd19..f884899ecd19 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 8ad4e6d6a8a6..8ad4e6d6a8a6 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 74d263a94179..74d263a94179 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 fd772a1ff9d2..fd772a1ff9d2 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 049c54d792b4..049c54d792b4 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 718554b20a48..718554b20a48 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/cxx11.patch b/nixpkgs/pkgs/development/libraries/xml-security-c/cxx11.patch
index bc87d4c1411e..bc87d4c1411e 100644
--- a/pkgs/development/libraries/xml-security-c/cxx11.patch
+++ b/nixpkgs/pkgs/development/libraries/xml-security-c/cxx11.patch
diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/nixpkgs/pkgs/development/libraries/xml-security-c/default.nix
index fec4bbe8efe2..fec4bbe8efe2 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 8e1d71fab3fa..8e1d71fab3fa 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 8a0017109bbf..8a0017109bbf 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 b19bf000b0d4..b19bf000b0d4 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 051a194af98e..051a194af98e 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 88a893c6e602..88a893c6e602 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 17d7320cb648..17d7320cb648 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 9f2b83d7597c..9f2b83d7597c 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 c9c84f4e1d89..c9c84f4e1d89 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 f9ce555cf27d..f9ce555cf27d 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 ffa326ccc538..ffa326ccc538 100644
--- a/pkgs/development/libraries/yder/default.nix
+++ b/nixpkgs/pkgs/development/libraries/yder/default.nix
diff --git a/pkgs/development/libraries/yder/fix-darwin.patch b/nixpkgs/pkgs/development/libraries/yder/fix-darwin.patch
index dedde22d9271..dedde22d9271 100644
--- a/pkgs/development/libraries/yder/fix-darwin.patch
+++ b/nixpkgs/pkgs/development/libraries/yder/fix-darwin.patch
diff --git a/pkgs/development/libraries/yder/fix-pkgconfig.patch b/nixpkgs/pkgs/development/libraries/yder/fix-pkgconfig.patch
index 61a67c5897b8..61a67c5897b8 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 6305b6c03a46..6305b6c03a46 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 5d7d0e664c64..5d7d0e664c64 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 c5dc775d0755..c5dc775d0755 100644
--- a/pkgs/development/libraries/zeitgeist/default.nix
+++ b/nixpkgs/pkgs/development/libraries/zeitgeist/default.nix
diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix
index 82b53402fc78..82b53402fc78 100644
--- a/pkgs/development/libraries/zeroc-ice/default.nix
+++ b/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix
diff --git a/pkgs/development/libraries/zeroc-ice/makefile.patch b/nixpkgs/pkgs/development/libraries/zeroc-ice/makefile.patch
index 6955bcd0a6d7..6955bcd0a6d7 100644
--- a/pkgs/development/libraries/zeroc-ice/makefile.patch
+++ b/nixpkgs/pkgs/development/libraries/zeroc-ice/makefile.patch
diff --git a/pkgs/development/libraries/zeromq/3.x.nix b/nixpkgs/pkgs/development/libraries/zeromq/3.x.nix
index 2fcf8bd91791..2fcf8bd91791 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 9fc0c4ac2306..9fc0c4ac2306 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 d22292669fae..d22292669fae 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 9b7a90266284..9b7a90266284 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 7fb5be1c3434..7fb5be1c3434 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 3de4978c3066..3de4978c3066 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 330b91e995d9..330b91e995d9 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 f7e849f6a334..f7e849f6a334 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 58e1940a3ef4..58e1940a3ef4 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 65509d766b96..65509d766b96 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 010c73336b92..010c73336b92 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 c55fb9b1a7c8..c55fb9b1a7c8 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 2afdf05546fe..2afdf05546fe 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 0e5c6a400872..0e5c6a400872 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 c9d8d52b0682..c9d8d52b0682 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 d8625182352f..d8625182352f 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 13965f14c5e2..13965f14c5e2 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 65fb6e615f5f..65fb6e615f5f 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 88948e3253df..88948e3253df 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 019a44482b9a..019a44482b9a 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 8975ada53206..8975ada53206 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 49eb9c403447..49eb9c403447 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 6c240d15c76e..6c240d15c76e 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 d2d846b78f2b..d2d846b78f2b 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 32fbbe4bb2bc..32fbbe4bb2bc 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 24efbdd3e16e..24efbdd3e16e 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 533faaec8e77..533faaec8e77 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 b0e97038b7b2..b0e97038b7b2 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 e2c632b8ebad..e2c632b8ebad 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 a5fddd417fa1..a5fddd417fa1 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 a657159a41f1..a657159a41f1 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 48dd57aac54b..48dd57aac54b 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 61a07c61ca07..61a07c61ca07 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 40d5aed49917..40d5aed49917 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 68c8a7e087b5..68c8a7e087b5 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-system-connections.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
index 65df45d95a50..65df45d95a50 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 4f438eb734a8..4f438eb734a8 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 4cba3e86e068..4cba3e86e068 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 a660882f36b1..a660882f36b1 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 c5305587a029..c5305587a029 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 5d7f3f2dd10b..5d7f3f2dd10b 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 0a2e56a9c9b8..0a2e56a9c9b8 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 6cf810707343..6cf810707343 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 1af0947627f5..1af0947627f5 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 c440c72788fe..c440c72788fe 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 001c7d9a5450..001c7d9a5450 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 a9808173b626..a9808173b626 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 4a533220caf5..4a533220caf5 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 2e387d29833f..2e387d29833f 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 531d429df244..531d429df244 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 5f93167a1141..5f93167a1141 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 a413743eb8d5..a413743eb8d5 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 9b053c920e32..9b053c920e32 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 d678fd8e9424..d678fd8e9424 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 722e05ed09c2..722e05ed09c2 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 edb4b01b0d1d..edb4b01b0d1d 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 a4a9a9261fd6..a4a9a9261fd6 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 36641b73b750..36641b73b750 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 0d0337a65cec..0d0337a65cec 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 ebff2928c3ea..ebff2928c3ea 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 a3aacd0aa8bd..a3aacd0aa8bd 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-csv.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
index 56ccab7b5cd5..56ccab7b5cd5 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 a1da44a6b896..a1da44a6b896 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 78f70be2f1fe..78f70be2f1fe 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 d032b4768dd6..d032b4768dd6 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 c33efa2eb08a..c33efa2eb08a 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 d41fe76ca232..d41fe76ca232 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-html-parse.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix
index 61a35f2b58c6..61a35f2b58c6 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 d1ce782e7f84..d1ce782e7f84 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 1f58be6c09e9..1f58be6c09e9 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 713aff0ea405..713aff0ea405 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 d8bc535f3559..d8bc535f3559 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 dfabda0428f0..dfabda0428f0 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 f37e653bc564..f37e653bc564 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 36d15673427c..36d15673427c 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 d506acf876ee..d506acf876ee 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 f52952af3e1a..f52952af3e1a 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 8967b0970c56..8967b0970c56 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 1590f2536e34..1590f2536e34 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 cfca59e3b503..cfca59e3b503 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 e8034b11c237..e8034b11c237 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 babdf04e3ec2..babdf04e3ec2 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 08b6a492e766..08b6a492e766 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 4c97f03870fa..4c97f03870fa 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 e65c0a03ddc5..e65c0a03ddc5 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 3f56cf3dfaee..3f56cf3dfaee 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-project.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
index 15fd56107c82..15fd56107c82 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 046f910a8660..046f910a8660 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 916af5b29727..916af5b29727 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 3ca67723925e..3ca67723925e 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 2aff988dfd24..2aff988dfd24 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 add200b09a1d..add200b09a1d 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 c19a47df6c23..c19a47df6c23 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 cded8dc2d06d..cded8dc2d06d 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 353c8210885e..353c8210885e 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 968f2972abfc..968f2972abfc 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 358666877a6d..358666877a6d 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 cec8cc2865c2..cec8cc2865c2 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 dbdd53a93469..dbdd53a93469 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 750da99d5d6a..750da99d5d6a 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 f44bd0f22e0c..f44bd0f22e0c 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 575e05aa074d..575e05aa074d 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_plus_ssl.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
index f329437a75af..f329437a75af 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 6de9d3f8fc9e..6de9d3f8fc9e 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 745b87a65764..745b87a65764 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 c1c80e48cbdb..c1c80e48cbdb 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 5477fc5cd027..5477fc5cd027 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 612e6b5c066e..612e6b5c066e 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 ce078c3196af..ce078c3196af 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 3866dd6f4594..3866dd6f4594 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 f55ccecadc61..f55ccecadc61 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 9f4abb8e4756..9f4abb8e4756 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 add3a15d27c7..add3a15d27c7 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 653adb3d12b3..653adb3d12b3 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 8243a3375853..8243a3375853 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 74b8442c0c90..74b8442c0c90 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 3f6d6ae32ac6..3f6d6ae32ac6 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 303d43a964ee..303d43a964ee 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 6f570ce5c8f0..6f570ce5c8f0 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 7375b8dd7094..7375b8dd7094 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 e1fb59658528..e1fb59658528 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 f4941aa80cd6..f4941aa80cd6 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 98c565648dcb..98c565648dcb 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 fcdb69f3c351..fcdb69f3c351 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 aa523d6f838b..aa523d6f838b 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 74648ba66a8c..74648ba66a8c 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 68a019fa027d..68a019fa027d 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 7c69878900cd..7c69878900cd 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 2f863a627bbc..2f863a627bbc 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 f76f5e7e561d..f76f5e7e561d 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 01acb76767ea..01acb76767ea 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 382143eb8fb3..382143eb8fb3 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/dexador.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
index c47d9f1a1aad..c47d9f1a1aad 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 3dbacdf0f81a..3dbacdf0f81a 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 541f1c6a169d..541f1c6a169d 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 95162ffc99a3..95162ffc99a3 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 a4a58fd0d0b6..a4a58fd0d0b6 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 91b8db69a36b..91b8db69a36b 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 d68fd839bd16..d68fd839bd16 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 3b2d0225ff92..3b2d0225ff92 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 cec236dc5565..cec236dc5565 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/fast-http.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
index 82c8603d4a45..82c8603d4a45 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 89bed83acd54..89bed83acd54 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 87d9fe983ec3..87d9fe983ec3 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 be9648a0da4a..be9648a0da4a 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 d9b25bebddc3..d9b25bebddc3 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 4a23cbf51ee7..4a23cbf51ee7 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 d901df215a68..d901df215a68 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 76e2a55620cb..76e2a55620cb 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/http-body.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
index 3754829ac37b..3754829ac37b 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 a74f24f8642f..a74f24f8642f 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 51f4a2d06980..51f4a2d06980 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 611ef77256fa..611ef77256fa 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 1b948bcf325e..1b948bcf325e 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 4211dfbc9194..4211dfbc9194 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/iolib.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
index c4ae44cd6761..c4ae44cd6761 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 195b52c08c45..195b52c08c45 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 aa650edde020..aa650edde020 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 c0ec72d48695..c0ec72d48695 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 4ba0cfa1ce2e..4ba0cfa1ce2e 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 7a1a12243fe2..7a1a12243fe2 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 4c3bcbb42b06..4c3bcbb42b06 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 f276ec72736d..f276ec72736d 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 9a4681894818..9a4681894818 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 81493865b864..81493865b864 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 e5cbad3e9e83..e5cbad3e9e83 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 b99f7867a7ac..b99f7867a7ac 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 7cce4b212941..7cce4b212941 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 6da62f22f65f..6da62f22f65f 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 c8ef9a7f6708..c8ef9a7f6708 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 1f6a0709b0f4..1f6a0709b0f4 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 9dd6baad1bdc..9dd6baad1bdc 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 10977c16f838..10977c16f838 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 4a5fe87982ae..4a5fe87982ae 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 354d6c315076..354d6c315076 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 348c71fe9663..348c71fe9663 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 a3ddc2fd953e..a3ddc2fd953e 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 7f88beb974b0..7f88beb974b0 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 8d21f88cbf82..8d21f88cbf82 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 7189a09e20cf..7189a09e20cf 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 1a94c643d8af..1a94c643d8af 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/lparallel.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix
index 1a6f217a2f96..1a6f217a2f96 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 19382889315a..19382889315a 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 db25e6ae5347..db25e6ae5347 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 4f6842606b45..4f6842606b45 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 953dd0a58a4a..953dd0a58a4a 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 d72e0839d1e8..d72e0839d1e8 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 6bbdf5f911e0..6bbdf5f911e0 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 6334804c4f70..6334804c4f70 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/moptilities.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix
index 1f2dd20ee4be..1f2dd20ee4be 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 470d2fed738c..470d2fed738c 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 a8cfc070bf99..a8cfc070bf99 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 068d0eba69dd..068d0eba69dd 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 82d06b1c93b2..82d06b1c93b2 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 4e7c84566a0a..4e7c84566a0a 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 ea6adac9e9f8..ea6adac9e9f8 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 07b86f58fe7c..07b86f58fe7c 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 bf6216dcaddc..bf6216dcaddc 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-number.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
index e636df0805e7..e636df0805e7 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 93890afd3004..93890afd3004 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 025d160f4602..025d160f4602 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 a913cdbe521c..a913cdbe521c 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 38fb942c331f..38fb942c331f 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 cd0db041c5b2..cd0db041c5b2 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 a9d07b48a9d4..a9d07b48a9d4 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 9f36a6717659..9f36a6717659 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 ba7bef260c08..ba7bef260c08 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 8ffcbc784ff7..8ffcbc784ff7 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.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
index a1542dc13cf6..a1542dc13cf6 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 ffa2e595c26a..ffa2e595c26a 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 4f6946783939..4f6946783939 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 0eb4c0f5b9e6..0eb4c0f5b9e6 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 de24a5984960..de24a5984960 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 589f69178991..589f69178991 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 2f30db52448c..2f30db52448c 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 25d535176a6a..25d535176a6a 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 d5be4be7daf4..d5be4be7daf4 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 c283abd479ed..c283abd479ed 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/salza2.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
index 9056cfbdcca8..9056cfbdcca8 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/simple-date.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
index 86890d60dc5e..86890d60dc5e 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 63adab55741b..63adab55741b 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 f0a21983f16f..f0a21983f16f 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 991791b57d02..991791b57d02 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 1cd4e4c44027..1cd4e4c44027 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 df63a5c9836a..df63a5c9836a 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/string-case.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix
index 17a56c09b7e8..17a56c09b7e8 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 e75cb087f38d..e75cb087f38d 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 301b12a8998e..301b12a8998e 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 f0df3b84f153..f0df3b84f153 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 4bae3cc1ceed..4bae3cc1ceed 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/trivial-backtrace.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
index 9a4afce3280f..9a4afce3280f 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-features.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
index 1a562c2288bb..1a562c2288bb 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-garbage.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
index 5c3c486fb0ff..5c3c486fb0ff 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 2aee236ac0ca..2aee236ac0ca 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 d34913b1656c..d34913b1656c 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-mimes.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
index f06c0d7ebf57..f06c0d7ebf57 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 8cc04c2c64ac..8cc04c2c64ac 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 c925382d81d4..c925382d81d4 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/uffi.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
index 1986f7c88f7a..1986f7c88f7a 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 fdaa07109b49..fdaa07109b49 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 6c4564967320..6c4564967320 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/usocket.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
index 6d02b9764701..6d02b9764701 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 0886b1082a88..0886b1082a88 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 6a4751f799ea..6a4751f799ea 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 0d8822c2f4fe..0d8822c2f4fe 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 f717441068b6..f717441068b6 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 4c88e839bdab..4c88e839bdab 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 4bfc0678f0f1..4bfc0678f0f1 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 0fd076509c22..0fd076509c22 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 ad90b8552181..ad90b8552181 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 b9ab71744c3a..b9ab71744c3a 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 c7031f4aa3fc..c7031f4aa3fc 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 e14a540a1783..e14a540a1783 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 74e5d7e97e95..74e5d7e97e95 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 3343f22b7b0b..3343f22b7b0b 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 5c56ddfa2a2f..5c56ddfa2a2f 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 0de50a17ad66..0de50a17ad66 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 3a0c5cb5fc2c..3a0c5cb5fc2c 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 ac3387d7b6d5..ac3387d7b6d5 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 bdee1c6dcf16..bdee1c6dcf16 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 3824a04826f1..3824a04826f1 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 1c4a682007fd..1c4a682007fd 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 9dd82ce2b2d6..9dd82ce2b2d6 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 9ba7a89eb253..9ba7a89eb253 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 7b4043042735..7b4043042735 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 30d14419461e..30d14419461e 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 b3d50b2fb075..b3d50b2fb075 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 544c4d423981..544c4d423981 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 091b94f58f51..091b94f58f51 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 03651222a045..03651222a045 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 3dae32b5e15d..3dae32b5e15d 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 039d522be6d7..039d522be6d7 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 1ce2dc809e5b..1ce2dc809e5b 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 c3f88f451e8d..c3f88f451e8d 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 5ef83ed77b3b..5ef83ed77b3b 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 f474f76f01e4..f474f76f01e4 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 79651db23ea4..79651db23ea4 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 dc8538db4c1f..dc8538db4c1f 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 4527a8700f6e..4527a8700f6e 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 c88b780d164a..c88b780d164a 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/loc/default.nix b/nixpkgs/pkgs/development/misc/loc/default.nix
index ad1d0e396a91..ad1d0e396a91 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 36dbce6bdfdf..36dbce6bdfdf 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 0456c8eae769..0456c8eae769 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 4ea98bfc8b2e..4ea98bfc8b2e 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 4230672e12f3..4230672e12f3 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 0ec8664dac9e..0ec8664dac9e 100644
--- a/pkgs/development/misc/qmk_firmware/default.nix
+++ b/nixpkgs/pkgs/development/misc/qmk_firmware/default.nix
diff --git a/pkgs/development/misc/rpiboot/unstable.nix b/nixpkgs/pkgs/development/misc/rpiboot/unstable.nix
index c89d2f11e954..c89d2f11e954 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 e66bb6fe2118..e66bb6fe2118 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 683883ddbce9..683883ddbce9 100644
--- a/pkgs/development/misc/stm32/inav/default.nix
+++ b/nixpkgs/pkgs/development/misc/stm32/inav/default.nix
diff --git a/pkgs/development/mobile/abootimg/default.nix b/nixpkgs/pkgs/development/mobile/abootimg/default.nix
index a2ddda34347a..a2ddda34347a 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 b6d35051733a..b6d35051733a 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 fffe2fbbcbed..fffe2fbbcbed 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 62cdeb43032e..62cdeb43032e 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 976ef1416275..976ef1416275 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 1aeef467642c..1aeef467642c 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 e5802c12e816..e5802c12e816 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 73f58ff5cdec..73f58ff5cdec 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 9623e01abcd7..9623e01abcd7 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 42d19cb69651..42d19cb69651 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 b05167460717..b05167460717 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 97fd197cb7d0..97fd197cb7d0 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 6c8f6d664d75..6c8f6d664d75 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 7ba74eb900fe..7ba74eb900fe 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 1c55734f5f42..1c55734f5f42 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 d902b1116658..d902b1116658 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 db1f7f1b8d32..db1f7f1b8d32 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 1aa49545254d..1aa49545254d 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 372a751f41cb..372a751f41cb 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 0c45a1162fef..0c45a1162fef 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 915cceec5469..915cceec5469 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 3b0303b86b4b..3b0303b86b4b 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 a8bea61ff548..a8bea61ff548 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 d812a679c021..d812a679c021 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 b81fab1ed76f..b81fab1ed76f 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 7af2d44a0f20..7af2d44a0f20 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 9d2f6eb6075e..9d2f6eb6075e 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 0f31396b8766..0f31396b8766 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 9957168f7af3..9957168f7af3 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 80b5858031d2..80b5858031d2 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 0234c9f3d04b..0234c9f3d04b 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 329b51518e4c..329b51518e4c 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 dd4b350b4372..dd4b350b4372 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 2c881a5c45a7..2c881a5c45a7 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 758383455e0c..758383455e0c 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 0b9bb7c5b5fc..0b9bb7c5b5fc 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 bd89b448eac2..bd89b448eac2 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 bb4ea396c09c..bb4ea396c09c 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 309142e0e1d2..309142e0e1d2 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 f78a10d82663..f78a10d82663 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 ba498ce0953b..ba498ce0953b 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 9cee1c9e5dee..9cee1c9e5dee 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 a7e158bd3bb1..a7e158bd3bb1 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 e29801c51f97..e29801c51f97 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.1.nix b/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix
index 13abc18f76ec..13abc18f76ec 100644
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix
+++ b/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix b/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix
index 5c1cd0a265ab..5c1cd0a265ab 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/webos/cmake-modules.nix b/nixpkgs/pkgs/development/mobile/webos/cmake-modules.nix
index f149cb622e13..f149cb622e13 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 7e52681e9a91..7e52681e9a91 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 52b50635e336..52b50635e336 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 f82009b0c39c..f82009b0c39c 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 05ddf5366c72..05ddf5366c72 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 f1941e051bc2..f1941e051bc2 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 47686e6d69e9..47686e6d69e9 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 d48fda7f38b9..d48fda7f38b9 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 1a55f8366a3b..1a55f8366a3b 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 d62902e4f6e4..d62902e4f6e4 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 9760285a915e..9760285a915e 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 fa4b4c3be568..fa4b4c3be568 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 880d72efd359..880d72efd359 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-v8.nix b/nixpkgs/pkgs/development/node-packages/composition-v8.nix
index 7fcc3f811339..7fcc3f811339 100644
--- a/pkgs/development/node-packages/composition-v8.nix
+++ b/nixpkgs/pkgs/development/node-packages/composition-v8.nix
diff --git a/pkgs/development/node-packages/default-v10.nix b/nixpkgs/pkgs/development/node-packages/default-v10.nix
index 7b25cd833e88..7b25cd833e88 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 c5db060989eb..c5db060989eb 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-v8.nix b/nixpkgs/pkgs/development/node-packages/default-v8.nix
index d90c3ab33641..d90c3ab33641 100644
--- a/pkgs/development/node-packages/default-v8.nix
+++ b/nixpkgs/pkgs/development/node-packages/default-v8.nix
diff --git a/pkgs/development/node-packages/generate.sh b/nixpkgs/pkgs/development/node-packages/generate.sh
index 5975cc8966bc..5975cc8966bc 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 670556bf271a..670556bf271a 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 58cf2dd1358f..58cf2dd1358f 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 b9ed26bd17e3..b9ed26bd17e3 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 3acee4158645..3acee4158645 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 e02ec8eeb1e9..e02ec8eeb1e9 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-v8.json b/nixpkgs/pkgs/development/node-packages/node-packages-v8.json
index b2187cc46809..b2187cc46809 100644
--- a/pkgs/development/node-packages/node-packages-v8.json
+++ b/nixpkgs/pkgs/development/node-packages/node-packages-v8.json
diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/nixpkgs/pkgs/development/node-packages/node-packages-v8.nix
index 3e5acf2e8528..3e5acf2e8528 100644
--- a/pkgs/development/node-packages/node-packages-v8.nix
+++ b/nixpkgs/pkgs/development/node-packages/node-packages-v8.nix
diff --git a/pkgs/development/ocaml-modules/alcotest/default.nix b/nixpkgs/pkgs/development/ocaml-modules/alcotest/default.nix
index c43ad10d7d82..c43ad10d7d82 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/angstrom/default.nix b/nixpkgs/pkgs/development/ocaml-modules/angstrom/default.nix
index 2bb717168ad7..2bb717168ad7 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 7b9f01751517..7b9f01751517 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 0e73c6a73d31..0e73c6a73d31 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 c6d99fa33e71..c6d99fa33e71 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 7410c19b2473..7410c19b2473 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 498315f9cbfd..498315f9cbfd 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 80addcfc3bb4..80addcfc3bb4 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 d0e89940433c..d0e89940433c 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 43fde1631ac7..43fde1631ac7 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 6b1e772bc7d1..6b1e772bc7d1 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 6119bcac876a..6119bcac876a 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 c6047f4ea1b7..c6047f4ea1b7 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 d8ef2fec9990..d8ef2fec9990 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 30e3687676ab..30e3687676ab 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 8128dc1cb6f5..8128dc1cb6f5 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 2633d43c1045..2633d43c1045 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 473c30b43459..473c30b43459 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 de2010275ef9..de2010275ef9 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/bigstringaf/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bigstringaf/default.nix
index 762e675d51ce..762e675d51ce 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 bc075295cf33..bc075295cf33 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 d2d3159cde14..d2d3159cde14 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 8f1917d68738..8f1917d68738 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/bisect_ppx-ocamlbuild/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix
index 38673fb9ddc4..38673fb9ddc4 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 9999cd06fcae..9999cd06fcae 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 b3dddec511c4..b3dddec511c4 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 3d1a554b3307..3d1a554b3307 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 359d83b4762a..359d83b4762a 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 b5a4f179b17a..b5a4f179b17a 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 0f168daac8c1..0f168daac8c1 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 22d000a5fd33..22d000a5fd33 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 c33deec9c784..c33deec9c784 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 0ec3a26d0511..0ec3a26d0511 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 31b4047efc81..31b4047efc81 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 8b0b70cae60e..8b0b70cae60e 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 a0a00472a4de..a0a00472a4de 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 44c5168ae518..44c5168ae518 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 c1490c3bf196..c1490c3bf196 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 87d0c8bec334..87d0c8bec334 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 a7e591e049e6..a7e591e049e6 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 48517036dc6d..48517036dc6d 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 48bd37677421..48bd37677421 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/checkseum/default.nix b/nixpkgs/pkgs/development/ocaml-modules/checkseum/default.nix
index 0e348dd65c38..0e348dd65c38 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 5fbb141b6cce..5fbb141b6cce 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 0a1a30a34730..0a1a30a34730 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 99f101010f3e..99f101010f3e 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 3d293b1a1ac4..3d293b1a1ac4 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 64a8f2416ad4..64a8f2416ad4 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 93ba084703e5..93ba084703e5 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 8192fced97be..8192fced97be 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 4d1c43e0ae18..4d1c43e0ae18 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 39234e86ef1c..39234e86ef1c 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 b6d2e24ec551..b6d2e24ec551 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 560600e2fee8..560600e2fee8 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 4ca9d4a30e0d..4ca9d4a30e0d 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 214721fa0906..214721fa0906 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 4da4d16df7dd..4da4d16df7dd 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 fe4fc5d87ab7..fe4fc5d87ab7 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 75b248a6a5e6..75b248a6a5e6 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 4832f5c39af3..4832f5c39af3 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 b64731261585..b64731261585 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/cpuid/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cpuid/default.nix
index 10938cf81c20..10938cf81c20 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 7720650ddfc9..7720650ddfc9 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 412146244278..412146244278 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 0122ec9ff61d..0122ec9ff61d 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 37c7f660ca6b..37c7f660ca6b 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 5a10d7cae48d..5a10d7cae48d 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 78600b783068..78600b783068 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/unix.nix b/nixpkgs/pkgs/development/ocaml-modules/cstruct/unix.nix
index 604ad4fb083b..604ad4fb083b 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 a7505f6f51cd..a7505f6f51cd 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 bfddc8d1c662..bfddc8d1c662 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 2fa9296d7e44..2fa9296d7e44 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 0ddf3cb5995c..0ddf3cb5995c 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 d08259af247c..d08259af247c 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 16c31fc3861a..16c31fc3861a 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 70ec7fd34ae1..70ec7fd34ae1 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 d8089bb533f0..d8089bb533f0 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/doc-ock-html/default.nix b/nixpkgs/pkgs/development/ocaml-modules/doc-ock-html/default.nix
index cd2e2761b503..cd2e2761b503 100644
--- a/pkgs/development/ocaml-modules/doc-ock-html/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/doc-ock-html/default.nix
diff --git a/pkgs/development/ocaml-modules/doc-ock-xml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/doc-ock-xml/default.nix
index cebf7707788d..cebf7707788d 100644
--- a/pkgs/development/ocaml-modules/doc-ock-xml/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/doc-ock-xml/default.nix
diff --git a/pkgs/development/ocaml-modules/doc-ock/default.nix b/nixpkgs/pkgs/development/ocaml-modules/doc-ock/default.nix
index ff42c93e5c1c..ff42c93e5c1c 100644
--- a/pkgs/development/ocaml-modules/doc-ock/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/doc-ock/default.nix
diff --git a/pkgs/development/ocaml-modules/dolmen/default.nix b/nixpkgs/pkgs/development/ocaml-modules/dolmen/default.nix
index 26876cad8c83..26876cad8c83 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 318353168336..318353168336 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/dtoa/default.nix b/nixpkgs/pkgs/development/ocaml-modules/dtoa/default.nix
index 87d9ac7a324d..87d9ac7a324d 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/dypgen/default.nix b/nixpkgs/pkgs/development/ocaml-modules/dypgen/default.nix
index 1abf387bdd3f..1abf387bdd3f 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 ab3011361e12..ab3011361e12 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/easy-format/default.nix b/nixpkgs/pkgs/development/ocaml-modules/easy-format/default.nix
index bbf4d82b5196..bbf4d82b5196 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/elina/default.nix b/nixpkgs/pkgs/development/ocaml-modules/elina/default.nix
index 44bfeb2d4740..44bfeb2d4740 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/camlp4.patch b/nixpkgs/pkgs/development/ocaml-modules/eliom/camlp4.patch
index 06d5ba1b7ed4..06d5ba1b7ed4 100644
--- a/pkgs/development/ocaml-modules/eliom/camlp4.patch
+++ b/nixpkgs/pkgs/development/ocaml-modules/eliom/camlp4.patch
diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix
index 010df7d8df92..010df7d8df92 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 9868ab93f791..9868ab93f791 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 c00af00b859f..c00af00b859f 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/enumerate/default.nix b/nixpkgs/pkgs/development/ocaml-modules/enumerate/default.nix
index 4f0c182726de..4f0c182726de 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/erm_xml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/erm_xml/default.nix
index 35b5c73b578b..35b5c73b578b 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 a6bb75e61c24..a6bb75e61c24 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 9f04dac343c4..9f04dac343c4 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 98ab04beb57c..98ab04beb57c 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 6058c87e7bd5..6058c87e7bd5 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 489b745c503a..489b745c503a 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 df0bd9133d3c..df0bd9133d3c 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 fc1936c2b473..fc1936c2b473 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 1740bd77fdb2..1740bd77fdb2 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 e8553ebf812e..e8553ebf812e 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 9b80433b6d19..9b80433b6d19 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 d739b33c8fab..d739b33c8fab 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 96423a213a19..96423a213a19 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 36c1342e61fa..36c1342e61fa 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 8c9aa46d9a00..8c9aa46d9a00 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 76cb6d088440..76cb6d088440 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 c7fff722399c..c7fff722399c 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 4f586f2f99e0..4f586f2f99e0 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 bcd877f2be23..bcd877f2be23 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 39ec4c011f85..39ec4c011f85 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 a174bd6a8b1a..a174bd6a8b1a 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 c8b29759b97c..c8b29759b97c 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 25f5e35492b2..25f5e35492b2 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 348f0cf2170b..348f0cf2170b 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 bff993a4d193..bff993a4d193 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 0869ae659cc3..0869ae659cc3 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 9c8a7c48255f..9c8a7c48255f 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 944195fd0a3e..944195fd0a3e 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/gmetadom/default.nix b/nixpkgs/pkgs/development/ocaml-modules/gmetadom/default.nix
index 1d5aabf30046..1d5aabf30046 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 d8d1d4631632..d8d1d4631632 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/gtktop/default.nix b/nixpkgs/pkgs/development/ocaml-modules/gtktop/default.nix
index 07420693005d..07420693005d 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 c9a40b61437a..c9a40b61437a 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 11e1b5dc6704..11e1b5dc6704 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 e8d9267aa858..e8d9267aa858 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 bbdaace293bf..bbdaace293bf 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 563d39909c8c..563d39909c8c 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 4a8b39063361..4a8b39063361 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 bec4f947ce30..bec4f947ce30 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 77b18f0ce3a9..77b18f0ce3a9 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/inifiles/default.nix b/nixpkgs/pkgs/development/ocaml-modules/inifiles/default.nix
index 1860e585b59f..1860e585b59f 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 e29930775212..e29930775212 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 bf2d2dd1e8b1..bf2d2dd1e8b1 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 e0f024569626..e0f024569626 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 cdc273d6ecfd..cdc273d6ecfd 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 3d5959fe64e2..3d5959fe64e2 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 15f3a5613b55..15f3a5613b55 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/iso8601/default.nix b/nixpkgs/pkgs/development/ocaml-modules/iso8601/default.nix
index 8a11d22c2c11..8a11d22c2c11 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/janestreet/async-extra.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-extra.nix
index 19eef7cf1825..19eef7cf1825 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 938f5ccf4474..938f5ccf4474 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 1f5ff6b9646f..1f5ff6b9646f 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 7db7cae27096..7db7cae27096 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 4cd67e1af86b..4cd67e1af86b 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 631562159762..631562159762 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 11e6189e6c1e..11e6189e6c1e 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 fdb0d8034e69..fdb0d8034e69 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 5410167e0a26..5410167e0a26 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 c2f97badda93..c2f97badda93 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 83e6100f0597..83e6100f0597 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 e5bbb7800520..e5bbb7800520 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 a8fff893d5c9..a8fff893d5c9 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 8823a0c8054d..8823a0c8054d 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 b3ffecb38ce9..b3ffecb38ce9 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/js-build-tools-darwin.patch b/nixpkgs/pkgs/development/ocaml-modules/janestreet/js-build-tools-darwin.patch
index 8878b4be68b8..8878b4be68b8 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 f77b793bcaab..f77b793bcaab 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 447a9cdf71f5..447a9cdf71f5 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 b61874d3a7ea..b61874d3a7ea 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 56a124c5b691..56a124c5b691 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 9dffbed69600..9dffbed69600 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 d70fe6ddd550..d70fe6ddd550 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 4f5bb87b7675..4f5bb87b7675 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 3fe78e3e7e2e..3fe78e3e7e2e 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 7844756c7bfb..7844756c7bfb 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 8dbf34ed2329..8dbf34ed2329 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 7e688a1dc1c8..7e688a1dc1c8 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 187d5db19995..187d5db19995 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 a05cf149b268..a05cf149b268 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 3aa157a68c5b..3aa157a68c5b 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 cd16d7c32864..cd16d7c32864 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 86394f228e9d..86394f228e9d 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 3498affeb090..3498affeb090 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 5dcfc97bfa37..5dcfc97bfa37 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 f3f4bcdead59..f3f4bcdead59 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 bf4a7b214dec..bf4a7b214dec 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 e83aaa2c2723..e83aaa2c2723 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 a1a1080d73d7..a1a1080d73d7 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 fc6d9ca03459..fc6d9ca03459 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 e6d23e0dbdd0..e6d23e0dbdd0 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 9bc1cbb59e46..9bc1cbb59e46 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 6604a8d012c6..6604a8d012c6 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 4a785d199c8c..4a785d199c8c 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 459743f055ab..459743f055ab 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 81e6c4be9cbc..81e6c4be9cbc 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 d9acadbb6158..d9acadbb6158 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 c06144a75c06..c06144a75c06 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 67e019b277af..67e019b277af 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 dde86bf3e526..dde86bf3e526 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 30aea547cbd1..30aea547cbd1 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 c4a7fa0f7a76..c4a7fa0f7a76 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/lablgl/META.patch b/nixpkgs/pkgs/development/ocaml-modules/lablgl/META.patch
index bf5b2184ac0a..bf5b2184ac0a 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 3d880c00947e..3d880c00947e 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 427d0d5a0e14..427d0d5a0e14 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 dae81f1df166..dae81f1df166 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 9e6013b9083f..9e6013b9083f 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 55a4a02f7ffc..55a4a02f7ffc 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 6b01929db768..6b01929db768 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 8ba27248db6a..8ba27248db6a 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 7e898be74901..7e898be74901 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 a266e57dd859..a266e57dd859 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 b5bcb0de1ee6..b5bcb0de1ee6 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 b4a4e012560e..b4a4e012560e 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 b316540e3d05..b316540e3d05 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/1.6.nix b/nixpkgs/pkgs/development/ocaml-modules/lambda-term/1.6.nix
index c0532ff03259..c0532ff03259 100644
--- a/pkgs/development/ocaml-modules/lambda-term/1.6.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lambda-term/1.6.nix
diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lambda-term/default.nix
index 18fe235710f8..18fe235710f8 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/linenoise/default.nix b/nixpkgs/pkgs/development/ocaml-modules/linenoise/default.nix
index b6b9b4163ff9..b6b9b4163ff9 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 3bced92cc3e3..3bced92cc3e3 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 157beaac4bc7..157beaac4bc7 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 d6ff17211994..d6ff17211994 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/lwt/3.x.nix b/nixpkgs/pkgs/development/ocaml-modules/lwt/3.x.nix
index c8371feb9052..c8371feb9052 100644
--- a/pkgs/development/ocaml-modules/lwt/3.x.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lwt/3.x.nix
diff --git a/pkgs/development/ocaml-modules/lwt/4.x.nix b/nixpkgs/pkgs/development/ocaml-modules/lwt/4.x.nix
index 105104bc308d..105104bc308d 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 fbf920d9621d..fbf920d9621d 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 cd40a5051be9..cd40a5051be9 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 fbd061a6566b..fbd061a6566b 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 7eea297e3eeb..7eea297e3eeb 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 41276668ecc9..41276668ecc9 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 49c2b7de3980..49c2b7de3980 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/macaque/default.nix b/nixpkgs/pkgs/development/ocaml-modules/macaque/default.nix
index 3d015e26275b..3d015e26275b 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 9a8a6259a778..9a8a6259a778 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 ca6ab458fff2..ca6ab458fff2 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 2c5c674425b4..2c5c674425b4 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 29fee1b63184..29fee1b63184 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 1a2a31277af4..1a2a31277af4 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 e69b9dabeabc..e69b9dabeabc 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 79b8b69bbb57..79b8b69bbb57 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/mlgmp/META b/nixpkgs/pkgs/development/ocaml-modules/mlgmp/META
index e132e179b33f..e132e179b33f 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 20455cc60167..20455cc60167 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 d25a5f4ce06c..d25a5f4ce06c 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/mparser/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mparser/default.nix
index 0e4d593482bb..0e4d593482bb 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 ae26f879ef8c..ae26f879ef8c 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 73f84886cc57..73f84886cc57 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 1986f7e48f69..1986f7e48f69 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 813b4d7f7a4a..813b4d7f7a4a 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 f273f28a71eb..f273f28a71eb 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 d46bff5b3d59..d46bff5b3d59 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/ocaml-cairo/META.patch b/nixpkgs/pkgs/development/ocaml-modules/ocaml-cairo/META.patch
index ba6e5927b00a..ba6e5927b00a 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 22215b8da0dc..22215b8da0dc 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 014525ef2b4e..014525ef2b4e 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 b789b133aaf3..b789b133aaf3 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 38050bc09a12..38050bc09a12 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-result/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocaml-result/default.nix
index 362ad697934f..362ad697934f 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-text/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocaml-text/default.nix
index 10d8484e3efa..10d8484e3efa 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/ocamlfuse/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocamlfuse/default.nix
index 20b63e3a8eef..20b63e3a8eef 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 e005024d2225..e005024d2225 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 38fca1c491fa..38fca1c491fa 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 d6d0c3292bb5..d6d0c3292bb5 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 6d9504370165..6d9504370165 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 9c4c2e21eddd..9c4c2e21eddd 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 33f328792110..33f328792110 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 8cfe43a5d322..8cfe43a5d322 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 29fa20d460d6..29fa20d460d6 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 d86b3f8da9f1..d86b3f8da9f1 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 6117d30665f0..6117d30665f0 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 6410eb296283..6410eb296283 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 084d70a8e790..084d70a8e790 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/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix
index cadb65bcbed9..cadb65bcbed9 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 1c09edf3a7ea..1c09edf3a7ea 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 569f5081355c..569f5081355c 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 147b4200cf69..147b4200cf69 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 4bc9b7f8629e..4bc9b7f8629e 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 38365a26b99a..38365a26b99a 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 4e46c1534d80..4e46c1534d80 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 72e22e5722d8..72e22e5722d8 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 4b6bea31b40c..4b6bea31b40c 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 a56a6140f8ea..a56a6140f8ea 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 0b342a654e6e..0b342a654e6e 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 874893d62976..874893d62976 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 f61a690da190..f61a690da190 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/opium/default.nix b/nixpkgs/pkgs/development/ocaml-modules/opium/default.nix
index 06784b445e3b..06784b445e3b 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 8388e108feff..8388e108feff 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 8a942288f752..8a942288f752 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 5b5661377471..5b5661377471 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 f6552d57683f..f6552d57683f 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 613973200d2d..613973200d2d 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 e80b322ffba1..e80b322ffba1 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 ac853c94094b..ac853c94094b 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 533a41cc435d..533a41cc435d 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 7ac6af3edd93..7ac6af3edd93 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/pa_bench/default.nix b/nixpkgs/pkgs/development/ocaml-modules/pa_bench/default.nix
index 2b821cd6dd6f..2b821cd6dd6f 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 2471c855cf54..2471c855cf54 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 5acf931b2eac..5acf931b2eac 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/pcre/default.nix b/nixpkgs/pkgs/development/ocaml-modules/pcre/default.nix
index 6428670ebb2f..6428670ebb2f 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 f4d1ef829bb4..f4d1ef829bb4 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/pipebang/default.nix b/nixpkgs/pkgs/development/ocaml-modules/pipebang/default.nix
index 1ab1c5fa7bc5..1ab1c5fa7bc5 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 bbe38ac89942..bbe38ac89942 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 6be1595f7c59..6be1595f7c59 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 bf85a42551c0..bf85a42551c0 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 899806c4dae2..899806c4dae2 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 3b72853e7828..3b72853e7828 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 20b78870f93b..20b78870f93b 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 24cfbcf5b7af..24cfbcf5b7af 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_yojson/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
index 53e8265c3a74..53e8265c3a74 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 5d45ee90c2e9..5d45ee90c2e9 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 bdcc6568ffe7..bdcc6568ffe7 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 2aa74d751dbf..2aa74d751dbf 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 363b774aaeba..363b774aaeba 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 7d8c14c55130..7d8c14c55130 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 e50deafd6e2d..e50deafd6e2d 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 b4b733ed7d84..b4b733ed7d84 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 92fb18378037..92fb18378037 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 57f1a832f562..57f1a832f562 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 08b9c10d9821..08b9c10d9821 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 f21f05eeae5f..f21f05eeae5f 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 91b0d22a8528..91b0d22a8528 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 46453f30d3bf..46453f30d3bf 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 dfe7ec84d636..dfe7ec84d636 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 ecc1a89a8040..ecc1a89a8040 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 29fb4fd09b2a..29fb4fd09b2a 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 fcb6eefe62b2..fcb6eefe62b2 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 2b7d9855665f..2b7d9855665f 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 46ad6fa801b8..46ad6fa801b8 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 74789636896f..74789636896f 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 05bfe2c09347..05bfe2c09347 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 9a053d4e9a2e..9a053d4e9a2e 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 b797af0a702a..b797af0a702a 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/rresult/default.nix b/nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix
index d40ce19a8fd8..d40ce19a8fd8 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 214789e52b4e..214789e52b4e 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 4f2cc99e76b2..4f2cc99e76b2 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 8165de242f57..8165de242f57 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 94120f2f8b9d..94120f2f8b9d 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/sedlex/default.nix b/nixpkgs/pkgs/development/ocaml-modules/sedlex/default.nix
index 4137abf1ac7b..4137abf1ac7b 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 7a50d1517db8..7a50d1517db8 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 06b95eff3f8d..06b95eff3f8d 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/sequence/default.nix b/nixpkgs/pkgs/development/ocaml-modules/sequence/default.nix
index e5ead36d1c19..e5ead36d1c19 100644
--- a/pkgs/development/ocaml-modules/sequence/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/sequence/default.nix
diff --git a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix b/nixpkgs/pkgs/development/ocaml-modules/sexplib/108.08.00.nix
index 685f2afb0b46..685f2afb0b46 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 e98a2ecdb30e..e98a2ecdb30e 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 24cdb497189e..24cdb497189e 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/spacetime_lib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/spacetime_lib/default.nix
index 1eb789ec2690..1eb789ec2690 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/sqlexpr/default.nix b/nixpkgs/pkgs/development/ocaml-modules/sqlexpr/default.nix
index df6b6f0854d4..df6b6f0854d4 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 7cc455b01957..7cc455b01957 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 38e1b3c7467d..38e1b3c7467d 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 e8f248ee4a1c..e8f248ee4a1c 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 b24d799cf28e..b24d799cf28e 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 0b8f83a1ea3e..0b8f83a1ea3e 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 d76ec29e63aa..d76ec29e63aa 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 c932bc3a46ac..c932bc3a46ac 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 117277fe1b6e..117277fe1b6e 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/textutils/default.nix b/nixpkgs/pkgs/development/ocaml-modules/textutils/default.nix
index 6f35b9702280..6f35b9702280 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 181946802d70..181946802d70 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/topkg/default.nix b/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix
index a3e718d53296..a3e718d53296 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 17f66227e9c5..17f66227e9c5 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 3a3e90c9d0fa..3a3e90c9d0fa 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 207a7b183e6e..207a7b183e6e 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 f17e5a7b89ef..f17e5a7b89ef 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 c54642afb41d..c54642afb41d 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 c50d08dd1448..c50d08dd1448 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 9500579e2458..9500579e2458 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 94bcdb45f328..94bcdb45f328 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 c943d3ce35a8..c943d3ce35a8 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 ed868c30a442..ed868c30a442 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 011acf01839e..011acf01839e 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 f08ee7fc2fc1..f08ee7fc2fc1 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/uucd/default.nix b/nixpkgs/pkgs/development/ocaml-modules/uucd/default.nix
index 773bec612d6a..773bec612d6a 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 b5074841eb1b..b5074841eb1b 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 125b117bcd83..125b117bcd83 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 263094ca2eb0..263094ca2eb0 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 404a463fd034..404a463fd034 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 b6b943b2a036..b6b943b2a036 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 425383a64854..425383a64854 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 cffbd77351c2..cffbd77351c2 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 25a83fa79128..25a83fa79128 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 e10a67a50a0d..e10a67a50a0d 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/wtf8/default.nix b/nixpkgs/pkgs/development/ocaml-modules/wtf8/default.nix
index 4c820d13808d..4c820d13808d 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 8d4bd4c82b39..8d4bd4c82b39 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 83e4451e668a..83e4451e668a 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 4324b62f9c6e..4324b62f9c6e 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 4c5d1edcb09f..4c5d1edcb09f 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/yojson/default.nix b/nixpkgs/pkgs/development/ocaml-modules/yojson/default.nix
index c660ca648566..c660ca648566 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 1d331090a44f..1d331090a44f 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 d9dcf1a53851..d9dcf1a53851 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 d454d244959f..d454d244959f 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 378bcf3acec0..378bcf3acec0 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/BerkeleyDB/default.nix b/nixpkgs/pkgs/development/perl-modules/BerkeleyDB/default.nix
index b23db8e1edfe..b23db8e1edfe 100644
--- a/pkgs/development/perl-modules/BerkeleyDB/default.nix
+++ b/nixpkgs/pkgs/development/perl-modules/BerkeleyDB/default.nix
diff --git a/pkgs/development/perl-modules/CatalystXScriptServerStarman-fork-arg.patch b/nixpkgs/pkgs/development/perl-modules/CatalystXScriptServerStarman-fork-arg.patch
index af7dc0db7e51..af7dc0db7e51 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/Compress-Raw-Zlib/default.nix b/nixpkgs/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
index 1163b6cb15b3..1163b6cb15b3 100644
--- a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
+++ b/nixpkgs/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
diff --git a/pkgs/development/perl-modules/DBD-Oracle/default.nix b/nixpkgs/pkgs/development/perl-modules/DBD-Oracle/default.nix
index a7ec1e2d1826..a7ec1e2d1826 100644
--- a/pkgs/development/perl-modules/DBD-Oracle/default.nix
+++ b/nixpkgs/pkgs/development/perl-modules/DBD-Oracle/default.nix
diff --git a/pkgs/development/perl-modules/DBD-Pg/default.nix b/nixpkgs/pkgs/development/perl-modules/DBD-Pg/default.nix
index 339791215385..339791215385 100644
--- a/pkgs/development/perl-modules/DBD-Pg/default.nix
+++ b/nixpkgs/pkgs/development/perl-modules/DBD-Pg/default.nix
diff --git a/pkgs/development/perl-modules/DBD-SQLite/default.nix b/nixpkgs/pkgs/development/perl-modules/DBD-SQLite/default.nix
index 5a24687c2b01..5a24687c2b01 100644
--- a/pkgs/development/perl-modules/DBD-SQLite/default.nix
+++ b/nixpkgs/pkgs/development/perl-modules/DBD-SQLite/default.nix
diff --git a/pkgs/development/perl-modules/DBD-SQLite/external-sqlite.patch b/nixpkgs/pkgs/development/perl-modules/DBD-SQLite/external-sqlite.patch
index 5aafa461d943..5aafa461d943 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/DBD-mysql/default.nix b/nixpkgs/pkgs/development/perl-modules/DBD-mysql/default.nix
index 54df32f3eb20..54df32f3eb20 100644
--- a/pkgs/development/perl-modules/DBD-mysql/default.nix
+++ b/nixpkgs/pkgs/development/perl-modules/DBD-mysql/default.nix
diff --git a/pkgs/development/perl-modules/DBD-sybase/default.nix b/nixpkgs/pkgs/development/perl-modules/DBD-sybase/default.nix
index e863663fc947..e863663fc947 100644
--- a/pkgs/development/perl-modules/DBD-sybase/default.nix
+++ b/nixpkgs/pkgs/development/perl-modules/DBD-sybase/default.nix
diff --git a/pkgs/development/perl-modules/DB_File/default.nix b/nixpkgs/pkgs/development/perl-modules/DB_File/default.nix
index d63e3a487276..d63e3a487276 100644
--- a/pkgs/development/perl-modules/DB_File/default.nix
+++ b/nixpkgs/pkgs/development/perl-modules/DB_File/default.nix
diff --git a/pkgs/development/perl-modules/Google-ProtocolBuffers-multiline-comments.patch b/nixpkgs/pkgs/development/perl-modules/Google-ProtocolBuffers-multiline-comments.patch
index 6b634d0d2424..6b634d0d2424 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 def32abf881c..def32abf881c 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 1e9e791257e7..1e9e791257e7 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 161f79a637be..161f79a637be 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/Paranoid-blessed-path.patch b/nixpkgs/pkgs/development/perl-modules/Paranoid-blessed-path.patch
index 5e8002501100..5e8002501100 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/Socket6-sv_undef.patch b/nixpkgs/pkgs/development/perl-modules/Socket6-sv_undef.patch
index 3ed4b61b6d3e..3ed4b61b6d3e 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 34221c0d20c7..34221c0d20c7 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/boost-geometry-utils-fix-oom.patch b/nixpkgs/pkgs/development/perl-modules/boost-geometry-utils-fix-oom.patch
index cbcce3819896..cbcce3819896 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 06207a8b7334..06207a8b7334 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 98c01508fd5a..98c01508fd5a 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 29ed83668ed5..29ed83668ed5 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 809cf87fcebf..809cf87fcebf 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 7473e2d1c15e..7473e2d1c15e 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 996cb92e6958..996cb92e6958 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 60ee68d99ada..60ee68d99ada 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 a9cf0d94e0d3..a9cf0d94e0d3 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 2c85d45691f0..2c85d45691f0 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 866dfa13f944..866dfa13f944 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 575f47629c26..575f47629c26 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 1aa0737afdbd..1aa0737afdbd 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 cfe1506640b3..cfe1506640b3 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 253e7e0bdc74..253e7e0bdc74 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 073b0f1c5ad3..073b0f1c5ad3 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/lwp-protocol-https-cert-file.patch b/nixpkgs/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch
index e9b501c29e26..e9b501c29e26 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 b23b7afa7a30..b23b7afa7a30 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/module-pluggable.patch b/nixpkgs/pkgs/development/perl-modules/module-pluggable.patch
index 51a029c106b9..51a029c106b9 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-ec2-ipv6.patch b/nixpkgs/pkgs/development/perl-modules/net-amazon-ec2-ipv6.patch
index 0568aeb56bf7..0568aeb56bf7 100644
--- a/pkgs/development/perl-modules/net-amazon-ec2-ipv6.patch
+++ b/nixpkgs/pkgs/development/perl-modules/net-amazon-ec2-ipv6.patch
diff --git a/pkgs/development/perl-modules/net-amazon-ec2-nova-compat.patch b/nixpkgs/pkgs/development/perl-modules/net-amazon-ec2-nova-compat.patch
index 5d9aef7f70d4..5d9aef7f70d4 100644
--- a/pkgs/development/perl-modules/net-amazon-ec2-nova-compat.patch
+++ b/nixpkgs/pkgs/development/perl-modules/net-amazon-ec2-nova-compat.patch
diff --git a/pkgs/development/perl-modules/net-amazon-mechanicalturk.patch b/nixpkgs/pkgs/development/perl-modules/net-amazon-mechanicalturk.patch
index dde13b9b0fca..dde13b9b0fca 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 e2f604985beb..e2f604985beb 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 097a7677e517..097a7677e517 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 42df14c40960..42df14c40960 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 a44dc4f2e42d..a44dc4f2e42d 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/xml-grove-utf8.patch b/nixpkgs/pkgs/development/perl-modules/xml-grove-utf8.patch
index d0b913090be4..d0b913090be4 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 8282c38a1e7f..8282c38a1e7f 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 bd84dd06e7f4..bd84dd06e7f4 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 47773c209545..47773c209545 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 a60afcd59ed7..a60afcd59ed7 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 3bd72434eb3c..3bd72434eb3c 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 0e65a9b990ed..0e65a9b990ed 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 084c46cd5b51..084c46cd5b51 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 3870ef2dd01c..3870ef2dd01c 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 d5bd1a2d8018..d5bd1a2d8018 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 2cdab404c5fe..2cdab404c5fe 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 f94ee8d7637f..f94ee8d7637f 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 846fb7e37306..846fb7e37306 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 54f99bf8afc9..54f99bf8afc9 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 ebd13743442d..ebd13743442d 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 74ec8e49343b..74ec8e49343b 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 efea0b4182c2..efea0b4182c2 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 22bbb4d3be41..22bbb4d3be41 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 efaa2211ae66..efaa2211ae66 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 51c57bb5c519..51c57bb5c519 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 7b615928da9a..7b615928da9a 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 d1657cdd445d..d1657cdd445d 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 08aa674eb6bb..08aa674eb6bb 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 77fae1d0981c..77fae1d0981c 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 2dd0865f6ea1..2dd0865f6ea1 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 7f3638fe5c9c..7f3638fe5c9c 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 98556acbf281..98556acbf281 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 950c536e7606..950c536e7606 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 63196fadf468..63196fadf468 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 8fbb1dac320d..8fbb1dac320d 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 4ae1e58a7bca..4ae1e58a7bca 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 d5b0a7dbde59..d5b0a7dbde59 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 20d61e5c3626..20d61e5c3626 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 a6bb2ed61672..a6bb2ed61672 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 235478a1776a..235478a1776a 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 91ff3a446c2b..91ff3a446c2b 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 8c39b9791e02..8c39b9791e02 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 dd7a945182ba..dd7a945182ba 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 03e322d74c0c..03e322d74c0c 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 8e2686110356..8e2686110356 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 4e6c0f9214c2..4e6c0f9214c2 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 5c8ec07f4bb1..5c8ec07f4bb1 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 34ee532c1fee..34ee532c1fee 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 3c685e0f34bc..3c685e0f34bc 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 ed89c26943f8..ed89c26943f8 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 3a01c9ba9831..3a01c9ba9831 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 72086a3487f3..72086a3487f3 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 550fa1da3edf..550fa1da3edf 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 24fe4a2458d6..24fe4a2458d6 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 937479959926..937479959926 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/IPy/default.nix b/nixpkgs/pkgs/development/python-modules/IPy/default.nix
index 7f258780d1c6..7f258780d1c6 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 44ec253fbf78..44ec253fbf78 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/JPype1/set-compiler-language.patch b/nixpkgs/pkgs/development/python-modules/JPype1/set-compiler-language.patch
index 1d5921a6ffab..1d5921a6ffab 100644
--- a/pkgs/development/python-modules/JPype1/set-compiler-language.patch
+++ b/nixpkgs/pkgs/development/python-modules/JPype1/set-compiler-language.patch
diff --git a/pkgs/development/python-modules/JayDeBeApi/default.nix b/nixpkgs/pkgs/development/python-modules/JayDeBeApi/default.nix
index a423945b0ce8..a423945b0ce8 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 866c04109294..866c04109294 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 85493f2760a3..85493f2760a3 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 6fe41e404192..6fe41e404192 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 6c4a2d310da7..6c4a2d310da7 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 52cf7598da8d..52cf7598da8d 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 a666cad1fc6d..a666cad1fc6d 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 48878995bb4e..48878995bb4e 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 75fceb7deedc..75fceb7deedc 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 ac19a7e7063c..ac19a7e7063c 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 7953829465b9..7953829465b9 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 554eaf977911..554eaf977911 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 45c42a7b43f9..45c42a7b43f9 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 adad20512927..adad20512927 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 18e5c80615a4..18e5c80615a4 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 6a44dc9a75f2..6a44dc9a75f2 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 678141f394f9..678141f394f9 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 d75511f8d4cf..d75511f8d4cf 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 29cb06310432..29cb06310432 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 9cc3403370f0..9cc3403370f0 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 e212e83c2708..e212e83c2708 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 e9156b5c6af1..e9156b5c6af1 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 eb56cfc1fa0a..eb56cfc1fa0a 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 34d4c2a37a70..34d4c2a37a70 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 9f764df3376c..9f764df3376c 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 83dab71e2216..83dab71e2216 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 a9720f45ef6f..a9720f45ef6f 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 5962b309ee5c..5962b309ee5c 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 e2fd802cf80e..e2fd802cf80e 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 4eaaf56b441f..4eaaf56b441f 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 f070dcb258e8..f070dcb258e8 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 ced0ff28090d..ced0ff28090d 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 82da607b3ef0..82da607b3ef0 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 b0992141faa0..b0992141faa0 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 8488278c934b..8488278c934b 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 aa8ed3929347..aa8ed3929347 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/aiodns/default.nix b/nixpkgs/pkgs/development/python-modules/aiodns/default.nix
index a8287df10f62..a8287df10f62 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 0afb1c432d6b..0afb1c432d6b 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 5df19e92e8d7..5df19e92e8d7 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 4728d819f05a..4728d819f05a 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/aioh2/default.nix b/nixpkgs/pkgs/development/python-modules/aioh2/default.nix
index fdeb5fb0082e..fdeb5fb0082e 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 00198cd27cff..00198cd27cff 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 37e0211d98db..37e0211d98db 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 51120d07121c..51120d07121c 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 f898c9313e1f..f898c9313e1f 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/default.nix b/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix
index 5769109f7741..5769109f7741 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix
diff --git a/nixpkgs/pkgs/development/python-modules/aiohttp_remotes/default.nix b/nixpkgs/pkgs/development/python-modules/aiohttp_remotes/default.nix
new file mode 100644
index 000000000000..c519f7fd4cfb
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/aiohttp_remotes/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchPypi, aiohttp }:
+
+buildPythonPackage rec {
+  pname = "aiohttp_remotes";
+  version = "0.1.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "43c3f7e1c5ba27f29fb4dbde5d43b900b5b5fc7e37bf7e35e6eaedabaec4a3fc";
+  };
+
+  LC_ALL = "en_US.UTF-8";
+
+  propagatedBuildInputs = [ aiohttp ];
+
+  meta = with lib; {
+    homepage = https://github.com/wikibusiness/aiohttp-remotes;
+    description = "A set of useful tools for aiohttp.web server";
+    license = [ licenses.mit ];
+    maintainers = [ maintainers.qyliss ];
+  };
+}
diff --git a/pkgs/development/python-modules/aiohue/default.nix b/nixpkgs/pkgs/development/python-modules/aiohue/default.nix
index 2b719ddf063d..2b719ddf063d 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 9003618a0fdc..9003618a0fdc 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/aiolifx-effects/default.nix b/nixpkgs/pkgs/development/python-modules/aiolifx-effects/default.nix
index bbe2b538ac5e..bbe2b538ac5e 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 0afaa65e40c5..0afaa65e40c5 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/aioprocessing/default.nix b/nixpkgs/pkgs/development/python-modules/aioprocessing/default.nix
index f2f959112688..f2f959112688 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/aioresponses/default.nix b/nixpkgs/pkgs/development/python-modules/aioresponses/default.nix
index 55120ad58038..55120ad58038 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 6350e3f0441a..6350e3f0441a 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/aiounifi/default.nix b/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix
index cee5c2606e08..cee5c2606e08 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/aiozeroconf/default.nix b/nixpkgs/pkgs/development/python-modules/aiozeroconf/default.nix
index 78b1c215c2bd..78b1c215c2bd 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 373c35440620..373c35440620 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 e5aaa9a6c769..e5aaa9a6c769 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 88fd18431d68..88fd18431d68 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 9313a255fd05..9313a255fd05 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 257e89790fa9..257e89790fa9 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/allpairspy/default.nix b/nixpkgs/pkgs/development/python-modules/allpairspy/default.nix
index e64a6004b789..e64a6004b789 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 1d61f1a6cc79..1d61f1a6cc79 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 4d78ad80cc32..4d78ad80cc32 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 a405b575b253..a405b575b253 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 bf008df3832f..bf008df3832f 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 682dee000144..682dee000144 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 7525df60575b..7525df60575b 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 1d5bf641f7cf..1d5bf641f7cf 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 f07f05b98843..f07f05b98843 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 ce7d9940bf2f..ce7d9940bf2f 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 de9048bde343..de9048bde343 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 77b93ce890e4..77b93ce890e4 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/ansible-kernel/default.nix b/nixpkgs/pkgs/development/python-modules/ansible-kernel/default.nix
index 34e360d2c1a4..34e360d2c1a4 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 ed5b35e8344d..ed5b35e8344d 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 56850dcf86e6..56850dcf86e6 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 e6e7b4532764..e6e7b4532764 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 5960e7b41334..5960e7b41334 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 a737cb06ea22..a737cb06ea22 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 08f93134b325..08f93134b325 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/antlr4-python2-runtime/default.nix b/nixpkgs/pkgs/development/python-modules/antlr4-python2-runtime/default.nix
index b343be1d7bbf..b343be1d7bbf 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 3ebba9f9d385..3ebba9f9d385 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 65476b47f8fd..65476b47f8fd 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 3821fea2446c..3821fea2446c 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 583b60444e35..583b60444e35 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/apipkg/default.nix b/nixpkgs/pkgs/development/python-modules/apipkg/default.nix
index a2a026e74d5b..a2a026e74d5b 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/aplpy/default.nix b/nixpkgs/pkgs/development/python-modules/aplpy/default.nix
index a173a58032d9..a173a58032d9 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 8716f007b87a..8716f007b87a 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 520e01723e6c..520e01723e6c 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 10f66b24d14f..10f66b24d14f 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 08f6fa529ca7..08f6fa529ca7 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 e067504987d8..e067504987d8 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 de64f86d7282..de64f86d7282 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 fb22128b9288..fb22128b9288 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/area53/default.nix b/nixpkgs/pkgs/development/python-modules/area53/default.nix
index cd8e83dbf630..cd8e83dbf630 100644
--- a/pkgs/development/python-modules/area53/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/area53/default.nix
diff --git a/pkgs/development/python-modules/arelle/default.nix b/nixpkgs/pkgs/development/python-modules/arelle/default.nix
index 85033a1846f2..85033a1846f2 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 e34cda99b251..e34cda99b251 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/argcomplete/default.nix b/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix
index efc4c824a395..efc4c824a395 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 8c6afb099f91..8c6afb099f91 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 187e795416cd..187e795416cd 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 943f129031e9..943f129031e9 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/arpeggio/default.nix b/nixpkgs/pkgs/development/python-modules/arpeggio/default.nix
index 045707aee4dc..045707aee4dc 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/arrow/default.nix b/nixpkgs/pkgs/development/python-modules/arrow/default.nix
index e357bef0dfdf..e357bef0dfdf 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/arxiv2bib/default.nix b/nixpkgs/pkgs/development/python-modules/arxiv2bib/default.nix
index 99725bcfa61d..99725bcfa61d 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 26a667bea4d1..26a667bea4d1 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 d71f0b640f9d..d71f0b640f9d 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/ase/default.nix b/nixpkgs/pkgs/development/python-modules/ase/default.nix
index 3a466170c77c..3a466170c77c 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 a07d370761a5..a07d370761a5 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 6af5b3da8808..6af5b3da8808 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 2b627fe80ff1..2b627fe80ff1 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 1a9103382327..1a9103382327 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 903b892f3222..903b892f3222 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 5338b67b50da..5338b67b50da 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 cdbbe547aec7..cdbbe547aec7 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 591726ea1ace..591726ea1ace 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 2027f694c77d..2027f694c77d 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 b5a7f014eec3..b5a7f014eec3 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 06716929575a..06716929575a 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 b2771505a663..b2771505a663 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 8c8a1b76b1a0..8c8a1b76b1a0 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 8dbb4da70603..8dbb4da70603 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 b8ec2f544762..b8ec2f544762 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 aabf30183d56..aabf30183d56 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/asyncssh/default.nix b/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix
index 42335a0393fe..42335a0393fe 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 845139a4fecf..845139a4fecf 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 a9c012ba8314..a9c012ba8314 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/atom/default.nix b/nixpkgs/pkgs/development/python-modules/atom/default.nix
index fdaebda089ff..fdaebda089ff 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 8f3aae7b19dd..8f3aae7b19dd 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 e34f937b5090..e34f937b5090 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 a2f6cd721b72..a2f6cd721b72 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/atsim_potentials/default.nix b/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix
index 5d664e77d295..5d664e77d295 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 29e3ca09cc51..29e3ca09cc51 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 0fe8241c2159..0fe8241c2159 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 9a6952c88f08..9a6952c88f08 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 addd187abeb6..addd187abeb6 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 ee029726d1c6..ee029726d1c6 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 de041c0f4c80..de041c0f4c80 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/authres/default.nix b/nixpkgs/pkgs/development/python-modules/authres/default.nix
index 8fe664f42310..8fe664f42310 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 0ccf3da7bec9..0ccf3da7bec9 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 bf7c35fa6989..bf7c35fa6989 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 090eb68675bc..090eb68675bc 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 808eba12bb6f..808eba12bb6f 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 d6b751034c65..d6b751034c65 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 8998abd6986a..8998abd6986a 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/default.nix b/nixpkgs/pkgs/development/python-modules/avro/default.nix
index 97ecb5a1127f..97ecb5a1127f 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 3a5b34ebb85d..3a5b34ebb85d 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 945c941dec4e..945c941dec4e 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 3283d76eae05..3283d76eae05 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 d93703c00c41..d93703c00c41 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/aws-adfs/default.nix b/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix
index 9e761b3698d6..9e761b3698d6 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 4554fe98c1b7..4554fe98c1b7 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 a9734745f21c..a9734745f21c 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 1a17d2650b5c..1a17d2650b5c 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-cli-core/default.nix b/nixpkgs/pkgs/development/python-modules/azure-cli-core/default.nix
index d5c9fa357842..d5c9fa357842 100644
--- a/pkgs/development/python-modules/azure-cli-core/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-cli-core/default.nix
diff --git a/pkgs/development/python-modules/azure-cli-telemetry/default.nix b/nixpkgs/pkgs/development/python-modules/azure-cli-telemetry/default.nix
index 73873076bda5..73873076bda5 100644
--- a/pkgs/development/python-modules/azure-cli-telemetry/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-cli-telemetry/default.nix
diff --git a/pkgs/development/python-modules/azure-common/default.nix b/nixpkgs/pkgs/development/python-modules/azure-common/default.nix
index 7634be181047..7634be181047 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-cosmos/default.nix b/nixpkgs/pkgs/development/python-modules/azure-cosmos/default.nix
index 2b7c7ded276c..2b7c7ded276c 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-mgmt-common/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-common/default.nix
index c11b8707cb10..c11b8707cb10 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 ffd2ea11d7c3..ffd2ea11d7c3 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-network/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix
index 63457d6f5423..63457d6f5423 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-nspkg/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix
index cf977539d5d2..cf977539d5d2 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-resource/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix
index e5f5b38509f4..e5f5b38509f4 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-storage/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix
index 12d10d8ac477..12d10d8ac477 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-nspkg/default.nix b/nixpkgs/pkgs/development/python-modules/azure-nspkg/default.nix
index f95db7b1c59c..f95db7b1c59c 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-servicemanagement-legacy/default.nix b/nixpkgs/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix
index 8148fe78e53c..8148fe78e53c 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 2531c440daf4..2531c440daf4 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 dc7a0c3107c0..dc7a0c3107c0 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/default.nix b/nixpkgs/pkgs/development/python-modules/azure-storage-file/default.nix
index ffdb2f656c1d..ffdb2f656c1d 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 5efef893a756..5efef893a756 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 1ca1288e9b44..1ca1288e9b44 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 6693a7464d43..6693a7464d43 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 87a39255561e..87a39255561e 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 003f996d29a2..003f996d29a2 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/backcall/default.nix b/nixpkgs/pkgs/development/python-modules/backcall/default.nix
index 2eb44cb36245..2eb44cb36245 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 1b8b8f2ba47e..1b8b8f2ba47e 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 ab34d376de08..ab34d376de08 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 ce5d15c212a1..ce5d15c212a1 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 bcaa844720bd..bcaa844720bd 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 82025df8b9e9..82025df8b9e9 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 9d0ddc2cad9a..9d0ddc2cad9a 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 3cd37617a393..3cd37617a393 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 013fe9f446ff..013fe9f446ff 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 c2dbb0e6fa80..c2dbb0e6fa80 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 3baaa871adf5..3baaa871adf5 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 8b818398ec9e..8b818398ec9e 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/bap/default.nix b/nixpkgs/pkgs/development/python-modules/bap/default.nix
index d14bf02cabf3..d14bf02cabf3 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 aafd73b8d8d5..aafd73b8d8d5 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 a210b5b44aae..a210b5b44aae 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 25b19a2b7314..25b19a2b7314 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 191f03426746..191f03426746 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/basiciw/default.nix b/nixpkgs/pkgs/development/python-modules/basiciw/default.nix
index 0d25d7cdbe98..0d25d7cdbe98 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 3e21fae1de66..3e21fae1de66 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 430e7c3da8aa..430e7c3da8aa 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 b4db16476d12..b4db16476d12 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 28cd08fb0fc3..28cd08fb0fc3 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 3b196810b005..3b196810b005 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 61080e5e4c46..61080e5e4c46 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 e83a9f67789c..e83a9f67789c 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 1b9ba31f0353..1b9ba31f0353 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 13aa48f7f8f3..13aa48f7f8f3 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 7ad3489553c2..7ad3489553c2 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 762154ac45d2..762154ac45d2 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 2ad23f1f9e65..2ad23f1f9e65 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 8051ed0beff5..8051ed0beff5 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 849b6e8b240a..849b6e8b240a 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 61dc1db1a486..61dc1db1a486 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/billiard/default.nix b/nixpkgs/pkgs/development/python-modules/billiard/default.nix
index dd4b548563cc..dd4b548563cc 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 77f1ff7cbd09..77f1ff7cbd09 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 9bd7e586820d..9bd7e586820d 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 beb03c894bed..beb03c894bed 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/0001-Buffer-Protocol-Py3.patch b/nixpkgs/pkgs/development/python-modules/bitarray/0001-Buffer-Protocol-Py3.patch
index e1019115ac74..e1019115ac74 100644
--- a/pkgs/development/python-modules/bitarray/0001-Buffer-Protocol-Py3.patch
+++ b/nixpkgs/pkgs/development/python-modules/bitarray/0001-Buffer-Protocol-Py3.patch
diff --git a/pkgs/development/python-modules/bitarray/default.nix b/nixpkgs/pkgs/development/python-modules/bitarray/default.nix
index c413303dd21d..c413303dd21d 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 0d1ac109179b..0d1ac109179b 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 0a54c0ed17c3..0a54c0ed17c3 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 d9ddc8426426..d9ddc8426426 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 dd85789c59e0..dd85789c59e0 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 092ad6c10035..092ad6c10035 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 23f4257a3574..23f4257a3574 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 2bc4a5bbb616..2bc4a5bbb616 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 ddbb2f0d27e8..ddbb2f0d27e8 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 270015a423ba..270015a423ba 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 f17f94387f3e..f17f94387f3e 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 b3c56a618e8e..b3c56a618e8e 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 c2b0db61cbb3..c2b0db61cbb3 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 784de33e7ade..784de33e7ade 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 23e9067ea33c..23e9067ea33c 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 441d1250e0a8..441d1250e0a8 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 96f7bfebdeb8..96f7bfebdeb8 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 e038e07507a0..e038e07507a0 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 d6d55accaca7..d6d55accaca7 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 1c86c02f7a88..1c86c02f7a88 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 f90f3f9af75a..f90f3f9af75a 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 fde330d706f7..fde330d706f7 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 6190adcba5f0..6190adcba5f0 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 158a3d318822..158a3d318822 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/boltons/default.nix b/nixpkgs/pkgs/development/python-modules/boltons/default.nix
index 655af7c66f2c..655af7c66f2c 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 823b9ab8c6a4..823b9ab8c6a4 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/bootstrapped-pip/default.nix b/nixpkgs/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 1455a783593f..1455a783593f 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 e58f071589a6..e58f071589a6 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 203ef9a4355d..203ef9a4355d 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 e3bbdf22ddf1..e3bbdf22ddf1 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 6e1eb5ced000..6e1eb5ced000 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 c4db013ea34d..c4db013ea34d 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 5870bdcdb732..5870bdcdb732 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 c1d9a1a8f82f..c1d9a1a8f82f 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 6a5e6f82b7c3..6a5e6f82b7c3 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 c81233045c05..c81233045c05 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 9a4a26e18b03..9a4a26e18b03 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 4633cb1ecfbf..4633cb1ecfbf 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 35b40a3adf1c..35b40a3adf1c 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 1dd2a070480f..1dd2a070480f 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 64510ee5b640..64510ee5b640 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 b5da73a32d21..b5da73a32d21 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 a286249ea0f3..a286249ea0f3 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 dfd4d8f0cbf1..dfd4d8f0cbf1 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 6e2e703dd569..6e2e703dd569 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 665d5347bbaf..665d5347bbaf 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 74df8a6b628f..74df8a6b628f 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 4af8b247fcf3..4af8b247fcf3 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 52d42b7a263d..52d42b7a263d 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 7459fc6f981b..7459fc6f981b 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 8de1572b48c0..8de1572b48c0 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 e03524ea5ada..e03524ea5ada 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 8fe5c7b56b4f..8fe5c7b56b4f 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 0ca2570496a0..0ca2570496a0 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 70dd13cf3b40..70dd13cf3b40 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 49f3c6d90f0a..49f3c6d90f0a 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 c76e62b0aec8..c76e62b0aec8 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 d8fc3d992352..d8fc3d992352 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 42918f023398..42918f023398 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/bz2file/default.nix b/nixpkgs/pkgs/development/python-modules/bz2file/default.nix
index 8efb1c083f26..8efb1c083f26 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 7fedf8c5461b..7fedf8c5461b 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 3a3e6d1e6dd9..3a3e6d1e6dd9 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 703f3797d1bf..703f3797d1bf 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 51bf0e753a91..51bf0e753a91 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 029a18644846..029a18644846 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/cairocffi/0_9.nix b/nixpkgs/pkgs/development/python-modules/cairocffi/0_9.nix
index 19a469dad262..19a469dad262 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 528c845c07ea..528c845c07ea 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 862f7bd4bf7c..862f7bd4bf7c 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 d42b8bcce48e..d42b8bcce48e 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 39ba63cc94d1..39ba63cc94d1 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 4fa5cc466c31..4fa5cc466c31 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 b6d40a5fdb70..b6d40a5fdb70 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 beee82950496..beee82950496 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 aa3aa8b9c02b..aa3aa8b9c02b 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 7f4857a95319..7f4857a95319 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 8e6c90441211..8e6c90441211 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 a6c3f485d74b..a6c3f485d74b 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 7457002929aa..7457002929aa 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 1afe23416331..1afe23416331 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 91e00ed7e43c..91e00ed7e43c 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/carbon/default.nix b/nixpkgs/pkgs/development/python-modules/carbon/default.nix
index 755f92117469..755f92117469 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 3b976fb7ad9a..3b976fb7ad9a 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 e54136a50276..e54136a50276 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/case/default.nix b/nixpkgs/pkgs/development/python-modules/case/default.nix
index 0f1bba36def6..0f1bba36def6 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 b5ee3b3b7805..b5ee3b3b7805 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 5d3b80aeb168..5d3b80aeb168 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/cbor/default.nix b/nixpkgs/pkgs/development/python-modules/cbor/default.nix
index 360872c0f896..360872c0f896 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 5d044b4199c6..5d044b4199c6 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 9751dcd2f3ed..9751dcd2f3ed 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 5596b3e37e59..5596b3e37e59 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 f40ff08fcf42..f40ff08fcf42 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 0c636e120884..0c636e120884 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 d499a937f501..d499a937f501 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 edcb4086cf21..edcb4086cf21 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 81f6ef1e8371..81f6ef1e8371 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 07dc701f3b1b..07dc701f3b1b 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/cffi/default.nix b/nixpkgs/pkgs/development/python-modules/cffi/default.nix
index cfabeb16b593..cfabeb16b593 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 f9eda427963b..f9eda427963b 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 ab6abc4cd6f6..ab6abc4cd6f6 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 d6205b27687d..d6205b27687d 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 d4f59d417714..d4f59d417714 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 e0317249fe9f..e0317249fe9f 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 2c97cbd4a334..2c97cbd4a334 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 16166d2db80e..16166d2db80e 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 42e24dedba29..42e24dedba29 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 eb769ed46239..eb769ed46239 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 19aaf3368e5d..19aaf3368e5d 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 a7e51a6513f6..a7e51a6513f6 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/default.nix b/nixpkgs/pkgs/development/python-modules/channels/default.nix
index a3b7e54c57a5..a3b7e54c57a5 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 f082510713ad..f082510713ad 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 829ae0b0f14a..829ae0b0f14a 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/check-manifest/default.nix b/nixpkgs/pkgs/development/python-modules/check-manifest/default.nix
index 1feec7ed828d..1feec7ed828d 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 98af2f10a0bb..98af2f10a0bb 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 08a455eb40c3..08a455eb40c3 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 daeb6ca45267..daeb6ca45267 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 a0c8d24889df..a0c8d24889df 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 c6338fce56bc..c6338fce56bc 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/circus/default.nix b/nixpkgs/pkgs/development/python-modules/circus/default.nix
index a4f96ccaf68e..a4f96ccaf68e 100644
--- a/pkgs/development/python-modules/circus/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/circus/default.nix
diff --git a/pkgs/development/python-modules/cjson/default.nix b/nixpkgs/pkgs/development/python-modules/cjson/default.nix
index 2042a2d629bb..2042a2d629bb 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/cld2-cffi/default.nix b/nixpkgs/pkgs/development/python-modules/cld2-cffi/default.nix
index a38d4c0866e0..a38d4c0866e0 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 146779082e4a..146779082e4a 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 9303f90141da..9303f90141da 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 1c209353f0e3..1c209353f0e3 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 a7ae70a43795..a7ae70a43795 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 2921970ff28a..2921970ff28a 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 daf522fe6534..daf522fe6534 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 4cd2ea15029b..4cd2ea15029b 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 f5626859d066..f5626859d066 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 a5124ac86134..a5124ac86134 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 8a487ab24102..8a487ab24102 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 3fe2af19fef9..3fe2af19fef9 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 9951b1711b39..9951b1711b39 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/cligj/default.nix b/nixpkgs/pkgs/development/python-modules/cligj/default.nix
index 0ec82efed8b2..0ec82efed8b2 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 1ac684e6d699..1ac684e6d699 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 602ab00b0849..602ab00b0849 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 ef7047afe7dd..ef7047afe7dd 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 f6c94ace1fad..f6c94ace1fad 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 33d036ad8d42..33d036ad8d42 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 4120dda54607..4120dda54607 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/cmarkgfm/default.nix b/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix
index b2f58887ffb5..b2f58887ffb5 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 e88f87b7bd0a..e88f87b7bd0a 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 cf0cff1f1551..cf0cff1f1551 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 0d0bc3682951..0d0bc3682951 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 43a7b7646dae..43a7b7646dae 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/codecov/default.nix b/nixpkgs/pkgs/development/python-modules/codecov/default.nix
index 6b2063f49922..6b2063f49922 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/cogapp/default.nix b/nixpkgs/pkgs/development/python-modules/cogapp/default.nix
index b660ed022577..b660ed022577 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 90eb1edc2cda..90eb1edc2cda 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 bcf327147965..bcf327147965 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 a3e613652db2..a3e613652db2 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 686608445abc..686608445abc 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 e85c95b85bda..e85c95b85bda 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/colorclass/default.nix b/nixpkgs/pkgs/development/python-modules/colorclass/default.nix
index b035bb9b57c9..b035bb9b57c9 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 42443c873d7d..42443c873d7d 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/colorlog/default.nix b/nixpkgs/pkgs/development/python-modules/colorlog/default.nix
index edcd040b0665..edcd040b0665 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 2e57ea538c94..2e57ea538c94 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/colour/default.nix b/nixpkgs/pkgs/development/python-modules/colour/default.nix
index a162b21b083d..a162b21b083d 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 93eb03272863..93eb03272863 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/conda/default.nix b/nixpkgs/pkgs/development/python-modules/conda/default.nix
index a240ea21e3e4..a240ea21e3e4 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 7d53f56a5a0a..7d53f56a5a0a 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 029f35ac87a8..029f35ac87a8 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 7fce23f89c11..7fce23f89c11 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 b0a563126e22..b0a563126e22 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 9e4f4072bf6a..9e4f4072bf6a 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/constantly/default.nix b/nixpkgs/pkgs/development/python-modules/constantly/default.nix
index 4766a1285acd..4766a1285acd 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 1009727c29ca..1009727c29ca 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 5c9e83b8d206..5c9e83b8d206 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 0fa72dfa687d..0fa72dfa687d 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 4722b049edf7..4722b049edf7 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 b378c901fad8..b378c901fad8 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 abccd1e136d8..abccd1e136d8 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 1b8e5b6061d7..1b8e5b6061d7 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/cornice/default.nix b/nixpkgs/pkgs/development/python-modules/cornice/default.nix
index 2b0c0665fa3f..2b0c0665fa3f 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 ad85218709e8..ad85218709e8 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 b6eb73a80386..b6eb73a80386 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 cda30943b0e4..cda30943b0e4 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 7515891456e9..7515891456e9 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 f27cfc44e57b..f27cfc44e57b 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 16b3998eb856..16b3998eb856 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/crcmod/default.nix b/nixpkgs/pkgs/development/python-modules/crcmod/default.nix
index f85e045d525e..f85e045d525e 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 e761792bb999..e761792bb999 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/cryptacular/default.nix b/nixpkgs/pkgs/development/python-modules/cryptacular/default.nix
index 02c1c420bfda..02c1c420bfda 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 6b20b4b570a3..6b20b4b570a3 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 ea24ed908016..ea24ed908016 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 8b2fe0929c7b..8b2fe0929c7b 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 a6c294456fa3..a6c294456fa3 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/cssselect/default.nix b/nixpkgs/pkgs/development/python-modules/cssselect/default.nix
index d086360b7d7c..d086360b7d7c 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 45a9920dbe2e..45a9920dbe2e 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 6dd680fe11f1..6dd680fe11f1 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 ab9ca9827186..ab9ca9827186 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 18693a204c53..18693a204c53 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 2b38f4a9e36e..2b38f4a9e36e 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 b60025a91b03..b60025a91b03 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 b0e9fee93d4c..b0e9fee93d4c 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 789fc7488fa4..789fc7488fa4 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 4847d57b67b3..4847d57b67b3 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 67120bf0f3d0..67120bf0f3d0 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 5708bf12d6bc..5708bf12d6bc 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 3d2205354044..3d2205354044 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 6862d6447e5f..6862d6447e5f 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 6c3e20b3f70d..6c3e20b3f70d 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 e69fbce21587..e69fbce21587 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 bb345ddc48ea..bb345ddc48ea 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 70b0da89d5ba..70b0da89d5ba 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 2f7992e860ff..2f7992e860ff 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 e577617c4780..e577617c4780 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 753b592a4c59..753b592a4c59 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/dask-glm/default.nix b/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix
index 73705d9982aa..73705d9982aa 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 7b12d1fcc220..7b12d1fcc220 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 94ecd10f45f2..94ecd10f45f2 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 48a545789db8..48a545789db8 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 1bba260e2a03..1bba260e2a03 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 5dfcd2f415b9..5dfcd2f415b9 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 cd38c8f137c5..cd38c8f137c5 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/dataclasses/default.nix b/nixpkgs/pkgs/development/python-modules/dataclasses/default.nix
index 44d4d3b57694..44d4d3b57694 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 72964e3d1f64..72964e3d1f64 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 fa0ac9dd7b45..fa0ac9dd7b45 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 cd7d6eb8cccd..cd7d6eb8cccd 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 48de7e86b92e..48de7e86b92e 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/datashape/default.nix b/nixpkgs/pkgs/development/python-modules/datashape/default.nix
index 63191aa224e3..63191aa224e3 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 3ea926ac23be..3ea926ac23be 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/dateparser/default.nix b/nixpkgs/pkgs/development/python-modules/dateparser/default.nix
index 22787df8bb64..22787df8bb64 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 63366d93056c..63366d93056c 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 7cb30937e0db..7cb30937e0db 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 2ba308596d49..2ba308596d49 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 6c50313a5183..6c50313a5183 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 262c93878d3f..262c93878d3f 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 e3bb0682b5c4..e3bb0682b5c4 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 46a229a99aea..46a229a99aea 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 fbc915c8eb04..fbc915c8eb04 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 fc9b9017cc99..fc9b9017cc99 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 f4395245a81f..f4395245a81f 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/deform/default.nix b/nixpkgs/pkgs/development/python-modules/deform/default.nix
index e1c37fe6eadd..e1c37fe6eadd 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 328195365006..328195365006 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/deluge-client/default.nix b/nixpkgs/pkgs/development/python-modules/deluge-client/default.nix
index 6f82adc94ca1..6f82adc94ca1 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 853beaf34a1c..853beaf34a1c 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 c0055580c403..c0055580c403 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/dependency-injector/default.nix b/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix
index af2607bca146..af2607bca146 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/deprecation/default.nix b/nixpkgs/pkgs/development/python-modules/deprecation/default.nix
index 600fe8887514..600fe8887514 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 84f30b7edf6e..84f30b7edf6e 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 996cd22e2633..996cd22e2633 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 05fa3aa835a3..05fa3aa835a3 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 9fbeef2488ca..9fbeef2488ca 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 6bdda6ac5ea7..6bdda6ac5ea7 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 016a3a919f15..016a3a919f15 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/dictionaries/default.nix b/nixpkgs/pkgs/development/python-modules/dictionaries/default.nix
index 0deab2762552..0deab2762552 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 7d30aad69c45..7d30aad69c45 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 cf1bebad1443..cf1bebad1443 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 57f0a1ef2381..57f0a1ef2381 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 e81caa66e5f3..e81caa66e5f3 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 af24ad8ed04c..af24ad8ed04c 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/discid/default.nix b/nixpkgs/pkgs/development/python-modules/discid/default.nix
index 2684d4a06a91..2684d4a06a91 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 c39bede9e093..c39bede9e093 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 41188a0de6e5..41188a0de6e5 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/distlib/default.nix b/nixpkgs/pkgs/development/python-modules/distlib/default.nix
index aea6bcd9504b..aea6bcd9504b 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 e21e6270b91a..e21e6270b91a 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 da082643e0fd..da082643e0fd 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 ad8da4255d69..ad8da4255d69 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 21aa4827b635..21aa4827b635 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 cbf12c17582a..cbf12c17582a 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 42e7fe6e9f4c..42e7fe6e9f4c 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 f334b7efeac6..f334b7efeac6 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 c9e56017447e..c9e56017447e 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 68fe4c913d69..68fe4c913d69 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 50922ccded20..50922ccded20 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-cache-url/default.nix b/nixpkgs/pkgs/development/python-modules/django-cache-url/default.nix
index 6b8aac33139c..6b8aac33139c 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-compat/default.nix b/nixpkgs/pkgs/development/python-modules/django-compat/default.nix
index 32d85cfadd71..32d85cfadd71 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 0ca6c400df28..0ca6c400df28 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 24146306af71..24146306af71 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-discover-runner/default.nix b/nixpkgs/pkgs/development/python-modules/django-discover-runner/default.nix
index 82895f76473b..82895f76473b 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-extensions/default.nix b/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix
index 822815736da7..822815736da7 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-gravatar2/default.nix b/nixpkgs/pkgs/development/python-modules/django-gravatar2/default.nix
index be153feb2a7c..be153feb2a7c 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 905ce92e5177..905ce92e5177 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 005d61acab9b..005d61acab9b 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 f41e7d146c97..f41e7d146c97 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 89147db63a88..89147db63a88 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 338af16b2e96..338af16b2e96 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-multiselectfield/default.nix b/nixpkgs/pkgs/development/python-modules/django-multiselectfield/default.nix
index e2db26fe26bb..e2db26fe26bb 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-pglocks/default.nix b/nixpkgs/pkgs/development/python-modules/django-pglocks/default.nix
index b2ee7b6f6442..b2ee7b6f6442 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 4bcd767bd63d..4bcd767bd63d 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 58e9d746b97f..58e9d746b97f 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 3a33960faf88..3a33960faf88 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-raster/default.nix b/nixpkgs/pkgs/development/python-modules/django-raster/default.nix
index b5cb017956c4..b5cb017956c4 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 a6edc98b0cb8..a6edc98b0cb8 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 e08c296e8076..e08c296e8076 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 68fa0dce6159..68fa0dce6159 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-sites/default.nix b/nixpkgs/pkgs/development/python-modules/django-sites/default.nix
index 2882e1dc2b93..2882e1dc2b93 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 b8924b37bfd0..b8924b37bfd0 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/1.10-gis-libs.template.patch b/nixpkgs/pkgs/development/python-modules/django/1.10-gis-libs.template.patch
index da154554d1b3..da154554d1b3 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 30db075bcf38..30db075bcf38 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 a459e3c0e10b..a459e3c0e10b 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_1.nix b/nixpkgs/pkgs/development/python-modules/django/2_1.nix
index da14dd4bd9c0..da14dd4bd9c0 100644
--- a/pkgs/development/python-modules/django/2_1.nix
+++ b/nixpkgs/pkgs/development/python-modules/django/2_1.nix
diff --git a/pkgs/development/python-modules/django/2_2.nix b/nixpkgs/pkgs/development/python-modules/django/2_2.nix
index 34b31bb35aba..34b31bb35aba 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 1ce86daf9925..1ce86daf9925 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 62efa6678002..62efa6678002 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 84dca56b22b1..84dca56b22b1 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 845d49288051..845d49288051 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 96c63738eb7b..96c63738eb7b 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 f95babfe2338..f95babfe2338 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 45447b70ae60..45447b70ae60 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 007d70ca8106..007d70ca8106 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 479e66289e64..479e66289e64 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 cf9516ce23a5..cf9516ce23a5 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 85761be9ba5f..85761be9ba5f 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 69c2f5317289..69c2f5317289 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 6bb2b1d43f15..6bb2b1d43f15 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 fa06117a6449..fa06117a6449 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 569df7f72469..569df7f72469 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 5c45b18be640..5c45b18be640 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 98f9c04c09fc..98f9c04c09fc 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 f50fd3ff9b61..f50fd3ff9b61 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/default.nix b/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix
index 12dcbf3993ab..12dcbf3993ab 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 1659d46abbc5..1659d46abbc5 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 ef0a6f907412..ef0a6f907412 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 eebc69a330fa..eebc69a330fa 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 c200b6959b64..c200b6959b64 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 c10dafdabc6e..c10dafdabc6e 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 d7ec8161ef5e..d7ec8161ef5e 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 65f45ca86f6b..65f45ca86f6b 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 74b49d1fa5a3..74b49d1fa5a3 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 307496cc65ce..307496cc65ce 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 84dba75e404a..84dba75e404a 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 e47196df07a1..e47196df07a1 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 fc6169f1b136..fc6169f1b136 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 678276b1b31a..678276b1b31a 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 f7a64481c663..f7a64481c663 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 61c71d87c533..61c71d87c533 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 8e6b00d808cb..8e6b00d808cb 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 f3be88987606..f3be88987606 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 b84535c21124..b84535c21124 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/dogpile.cache/default.nix b/nixpkgs/pkgs/development/python-modules/dogpile.cache/default.nix
index b44597b8d13f..b44597b8d13f 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 622954f61449..622954f61449 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 804267268d78..804267268d78 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 e8a65bbc87be..e8a65bbc87be 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 94c67afe164d..94c67afe164d 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 beaca0757507..beaca0757507 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 9d644c22eaf5..9d644c22eaf5 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/dpath/default.nix b/nixpkgs/pkgs/development/python-modules/dpath/default.nix
index 3b878f7d5e4c..3b878f7d5e4c 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 c8c7f255afa8..c8c7f255afa8 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/dropbox/default.nix b/nixpkgs/pkgs/development/python-modules/dropbox/default.nix
index ade485c91dc6..ade485c91dc6 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 ccc5c574689c..ccc5c574689c 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 601ebf6d9a99..601ebf6d9a99 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 09faabb98cc6..09faabb98cc6 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 5ab65ace69f5..5ab65ace69f5 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 5c0e57cddc02..5c0e57cddc02 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 d4cd0e711a0d..d4cd0e711a0d 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 dae1df695624..dae1df695624 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 4179306b8d9e..4179306b8d9e 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 3a7046c50b30..3a7046c50b30 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 7f8a803740d0..7f8a803740d0 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/easywatch/default.nix b/nixpkgs/pkgs/development/python-modules/easywatch/default.nix
index 96301996fe8d..96301996fe8d 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 95e1835198e0..95e1835198e0 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 62111721ad11..62111721ad11 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 b1026e8d446a..b1026e8d446a 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 3f276374d9ea..3f276374d9ea 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 b09bef9fec4e..b09bef9fec4e 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 6b8329550da3..6b8329550da3 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 0622bd41d237..0622bd41d237 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-curator/default.nix b/nixpkgs/pkgs/development/python-modules/elasticsearch-curator/default.nix
index d517af949d47..d517af949d47 100644
--- a/pkgs/development/python-modules/elasticsearch-curator/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/elasticsearch-curator/default.nix
diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix
index b906f94b4272..b906f94b4272 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 dc991f529fcb..dc991f529fcb 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/elpy/default.nix b/nixpkgs/pkgs/development/python-modules/elpy/default.nix
index 3816a8c42e70..3816a8c42e70 100644
--- a/pkgs/development/python-modules/elpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/elpy/default.nix
diff --git a/pkgs/development/python-modules/email-validator/default.nix b/nixpkgs/pkgs/development/python-modules/email-validator/default.nix
index 99859ac15175..99859ac15175 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/emcee/default.nix b/nixpkgs/pkgs/development/python-modules/emcee/default.nix
index 382dd5089153..382dd5089153 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 c00ca778bc6c..c00ca778bc6c 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/entrypoints/default.nix b/nixpkgs/pkgs/development/python-modules/entrypoints/default.nix
index 77d20876fe15..77d20876fe15 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 29c8184bd4e8..29c8184bd4e8 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 8aec63689d90..8aec63689d90 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 a5175eba49d8..a5175eba49d8 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 600cb3b0320e..600cb3b0320e 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 d776bfd62aac..d776bfd62aac 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 fe3cc4420c48..fe3cc4420c48 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 742fdb83b72e..742fdb83b72e 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 6b3909a5b458..6b3909a5b458 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 b2ac36582357..b2ac36582357 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 09475329c1bb..09475329c1bb 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 1e6e1e70944d..1e6e1e70944d 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/eth-hash/default.nix b/nixpkgs/pkgs/development/python-modules/eth-hash/default.nix
index ce5fce1b1cba..ce5fce1b1cba 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 fee2156e67db..fee2156e67db 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 5fb83126d1c7..5fb83126d1c7 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 f44a9f222794..f44a9f222794 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 e23821a48e46..e23821a48e46 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 a72184f2c1ea..a72184f2c1ea 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 147e18d45f42..147e18d45f42 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 93c2165ce014..93c2165ce014 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 189f282b02d2..189f282b02d2 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 a24d049fc229..a24d049fc229 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 d6f533a58bfe..d6f533a58bfe 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 6c070acaf75a..6c070acaf75a 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 4e1b78f80be9..4e1b78f80be9 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/exifread/default.nix b/nixpkgs/pkgs/development/python-modules/exifread/default.nix
index 61593b625f72..61593b625f72 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 adcc43f26509..adcc43f26509 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 a06f276232ef..a06f276232ef 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 94fca96b455b..94fca96b455b 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 107259854976..107259854976 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 2856eeeab1b9..2856eeeab1b9 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 960bffb903d6..960bffb903d6 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 d74c6e574705..d74c6e574705 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/factory_boy/default.nix b/nixpkgs/pkgs/development/python-modules/factory_boy/default.nix
index 0c87f309489e..0c87f309489e 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 f17af02ee0fb..f17af02ee0fb 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 e597e07ca364..e597e07ca364 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 20a767774138..20a767774138 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/fastcache/default.nix b/nixpkgs/pkgs/development/python-modules/fastcache/default.nix
index f50eb8f53bb1..f50eb8f53bb1 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 50a6dbf40df6..50a6dbf40df6 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 e2e0a4d4d92e..e2e0a4d4d92e 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 02c1ea60e611..02c1ea60e611 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 090f9dd82601..090f9dd82601 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 260d1b7f4b30..260d1b7f4b30 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 63a7565cf55a..63a7565cf55a 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 9b553e65db64..9b553e65db64 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 05034dc75262..05034dc75262 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 d69c320ccaac..d69c320ccaac 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 019f4be91c82..019f4be91c82 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 25aae4591eb5..25aae4591eb5 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 869e26d675a3..869e26d675a3 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 67ff86e8f729..67ff86e8f729 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 c8ea6df7ae0c..c8ea6df7ae0c 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 ac91fe51d899..ac91fe51d899 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 8922d6e05195..8922d6e05195 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 d0d324fb9774..d0d324fb9774 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 b02ff0c74579..b02ff0c74579 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 3592a1f28c71..3592a1f28c71 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 731b83294a8f..731b83294a8f 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 34f7ac4e4a93..34f7ac4e4a93 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 47f2c083d8a3..47f2c083d8a3 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 4d9d250815a9..4d9d250815a9 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 ebd100037b25..ebd100037b25 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/fire/default.nix b/nixpkgs/pkgs/development/python-modules/fire/default.nix
index c44083e4c29a..c44083e4c29a 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 21e44bb45815..21e44bb45815 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 3b91fb717bc4..3b91fb717bc4 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 93bf4716073f..93bf4716073f 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 35bf7cb90df9..35bf7cb90df9 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 f999bab89324..f999bab89324 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 32e9a08b7414..32e9a08b7414 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 c9cf3fe4ca84..c9cf3fe4ca84 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 8099f3318e86..8099f3318e86 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/default.nix b/nixpkgs/pkgs/development/python-modules/flake8/default.nix
index 7016e69bd0c1..7016e69bd0c1 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 523e6ac53e6b..523e6ac53e6b 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/flask-api/default.nix b/nixpkgs/pkgs/development/python-modules/flask-api/default.nix
index b0f9682ed854..b0f9682ed854 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-assets/default.nix b/nixpkgs/pkgs/development/python-modules/flask-assets/default.nix
index a8e454f4a2cc..a8e454f4a2cc 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 afd3db60ffcf..afd3db60ffcf 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 caaf0a61152b..caaf0a61152b 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-bootstrap/default.nix b/nixpkgs/pkgs/development/python-modules/flask-bootstrap/default.nix
index 7c12b79bb2f3..7c12b79bb2f3 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 84f549231ce6..84f549231ce6 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 05385e08d05e..05385e08d05e 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 b602fcfd4947..b602fcfd4947 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 2c07b68c3b8c..2c07b68c3b8c 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 466bfb441219..466bfb441219 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-jwt-extended/default.nix b/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix
index d61f5a776004..d61f5a776004 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 99b57dac816f..99b57dac816f 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 a60c5a993ea3..a60c5a993ea3 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 d466a78a6811..d466a78a6811 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 a1732d3ccbfe..a1732d3ccbfe 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 b03f3307d085..b03f3307d085 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 d7fbec5715de..d7fbec5715de 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-oauthlib/default.nix b/nixpkgs/pkgs/development/python-modules/flask-oauthlib/default.nix
index 587057514156..587057514156 100644
--- a/pkgs/development/python-modules/flask-oauthlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-oauthlib/default.nix
diff --git a/pkgs/development/python-modules/flask-paginate/default.nix b/nixpkgs/pkgs/development/python-modules/flask-paginate/default.nix
index a2c372c8beeb..a2c372c8beeb 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 cbdbd9892115..cbdbd9892115 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 89cc47cbcfbc..89cc47cbcfbc 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 f7f8360fa48d..f7f8360fa48d 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 51ba7ce4d7cd..51ba7ce4d7cd 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 edc873458a11..edc873458a11 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 b97fc2430be7..b97fc2430be7 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-sqlalchemy/default.nix b/nixpkgs/pkgs/development/python-modules/flask-sqlalchemy/default.nix
index aa7b40675b89..aa7b40675b89 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/default.nix b/nixpkgs/pkgs/development/python-modules/flask-swagger/default.nix
index c690e4e64ae5..c690e4e64ae5 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 04c083a32638..04c083a32638 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 96828dcdce25..96828dcdce25 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 df39b2ea7253..df39b2ea7253 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 d3a46143e6e5..d3a46143e6e5 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 e4da4ce79260..e4da4ce79260 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 88dfff3aa8f9..88dfff3aa8f9 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 64decd9c41c8..64decd9c41c8 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 96073556ea43..96073556ea43 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 8af0bce82f3c..8af0bce82f3c 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/flup/default.nix b/nixpkgs/pkgs/development/python-modules/flup/default.nix
index 8256f5a1063d..8256f5a1063d 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/fn/default.nix b/nixpkgs/pkgs/development/python-modules/fn/default.nix
index 550c4a711013..550c4a711013 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 c8eca2ac60cb..c8eca2ac60cb 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 4e83955db55c..4e83955db55c 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 8680ff2d2aad..8680ff2d2aad 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 534f2cd7bb74..534f2cd7bb74 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/fpdf/default.nix b/nixpkgs/pkgs/development/python-modules/fpdf/default.nix
index a528244cb0f9..a528244cb0f9 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 a27e9494911c..a27e9494911c 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 3f0fd31d8a15..3f0fd31d8a15 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 ced7d7bdcd4a..ced7d7bdcd4a 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 94d42206d63d..94d42206d63d 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 26277161b0bc..26277161b0bc 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 cbbb88868468..cbbb88868468 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/ftfy/default.nix b/nixpkgs/pkgs/development/python-modules/ftfy/default.nix
index f6fa41e33f83..f6fa41e33f83 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 d3d338a2c8d3..d3d338a2c8d3 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 de45a1404f57..de45a1404f57 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 6c3f5f6d0186..6c3f5f6d0186 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 5a4701df9c31..5a4701df9c31 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 f4ecec3b6137..f4ecec3b6137 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 fea79db3d05b..fea79db3d05b 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 fd36c7590b5e..fd36c7590b5e 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 cf965dd244fc..cf965dd244fc 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 80ca5099f344..80ca5099f344 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 c9b49fee4cb6..c9b49fee4cb6 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 ecaa1c08b2c2..ecaa1c08b2c2 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 e7397950643f..e7397950643f 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 7091799decab..7091799decab 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/gast/default.nix b/nixpkgs/pkgs/development/python-modules/gast/default.nix
index a85f78dccb28..a85f78dccb28 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 e0b6b3e49fa4..e0b6b3e49fa4 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 e6f45a2b4c69..e6f45a2b4c69 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 dbf2911ce195..dbf2911ce195 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 0b2d0fbc91d1..0b2d0fbc91d1 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 d352d6def24f..d352d6def24f 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 a39d3e58733e..a39d3e58733e 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 c8bbeefd6acd..c8bbeefd6acd 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 c86fae5d0e9d..c86fae5d0e9d 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 93e52c51dda3..93e52c51dda3 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 57105f87a7c0..57105f87a7c0 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 d7b73071b0c9..d7b73071b0c9 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 250942a84884..250942a84884 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/geoip2/default.nix b/nixpkgs/pkgs/development/python-modules/geoip2/default.nix
index 97371d1b65a2..97371d1b65a2 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 91b8d455cdef..91b8d455cdef 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 25a5e7e3ed5d..25a5e7e3ed5d 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/default.nix b/nixpkgs/pkgs/development/python-modules/geopy/default.nix
index 9dbfeb7472c0..9dbfeb7472c0 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/gevent-socketio/default.nix b/nixpkgs/pkgs/development/python-modules/gevent-socketio/default.nix
index e95519a346c5..e95519a346c5 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 78986ec7d306..78986ec7d306 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 a8caf6500162..a8caf6500162 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 6a78d60544db..6a78d60544db 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 9eb8e3b2d6ce..9eb8e3b2d6ce 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 3a5fbe8433ce..3a5fbe8433ce 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 140f93f33f80..140f93f33f80 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 8701751e3a0b..8701751e3a0b 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 8255668de1cf..8255668de1cf 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 ec58825878ae..ec58825878ae 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 8b1b854058b9..8b1b854058b9 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-sweep/default.nix b/nixpkgs/pkgs/development/python-modules/git-sweep/default.nix
index e2182892e851..e2182892e851 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 ceca6e3719b4..ceca6e3719b4 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 2b6a118885c7..2b6a118885c7 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 99af2830167f..99af2830167f 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 d0d82adf4911..d0d82adf4911 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 9670428a3e5f..9670428a3e5f 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 f47f1218aea5..f47f1218aea5 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/globus-sdk/default.nix b/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix
index e42cf5756f1e..e42cf5756f1e 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 ac193e61dcbd..ac193e61dcbd 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/gmpy/default.nix b/nixpkgs/pkgs/development/python-modules/gmpy/default.nix
index 73f1175e0bd6..73f1175e0bd6 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 fc5549064098..fc5549064098 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 f8dfc4ff2d39..f8dfc4ff2d39 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 967fc1c57457..967fc1c57457 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 61c799589a98..61c799589a98 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 e63c97c67936..e63c97c67936 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 e746b304e8b5..e746b304e8b5 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 1acc9603db34..1acc9603db34 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 c76f5c572e40..c76f5c572e40 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 b318016ee815..b318016ee815 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 6a9a3160c9b2..6a9a3160c9b2 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 6a882e29c194..6a882e29c194 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 84f677d4d4e4..84f677d4d4e4 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 71aa37d00866..71aa37d00866 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 e469de924f6a..e469de924f6a 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 5cb027eef460..5cb027eef460 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 51b03bf55942..51b03bf55942 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 b0b6bfaa5ef9..b0b6bfaa5ef9 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 90c8e752d412..90c8e752d412 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 7f605d73c97a..7f605d73c97a 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 1646888b36ad..1646888b36ad 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 23f08f3bbef0..23f08f3bbef0 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 51782dce167a..51782dce167a 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 f0a47d7c30ff..f0a47d7c30ff 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 c57433a3ebd8..c57433a3ebd8 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 9475c792fb90..9475c792fb90 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 f514d22ef081..f514d22ef081 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 0f46ff36a39f..0f46ff36a39f 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 398c2b664677..398c2b664677 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 d6f89aefc5fa..d6f89aefc5fa 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 98778ddf3215..98778ddf3215 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 1e103ab14250..1e103ab14250 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 d4052a227bb4..d4052a227bb4 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 c48c0c7b16ce..c48c0c7b16ce 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 5dc45ad469db..5dc45ad469db 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 da5f06da82a5..da5f06da82a5 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 774d494e71aa..774d494e71aa 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 4b574b859237..4b574b859237 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 1bdd3635b210..1bdd3635b210 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 f347a1f2553c..f347a1f2553c 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 f9e4161d80d7..f9e4161d80d7 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 87f2915d6c50..87f2915d6c50 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 5fb1cb653204..5fb1cb653204 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 efb0c6aacd8c..efb0c6aacd8c 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 2036b9aea97a..2036b9aea97a 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 9c8d6ca93e05..9c8d6ca93e05 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 74c9370dad30..74c9370dad30 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 1422469784d1..1422469784d1 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 01caeed4866a..01caeed4866a 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 2da82fc4933b..2da82fc4933b 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 aabc73f571c0..aabc73f571c0 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 afe1f1db11ac..afe1f1db11ac 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 096f93b017f4..096f93b017f4 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 337624012aad..337624012aad 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 13ba4f934e89..13ba4f934e89 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 9d760b37d379..9d760b37d379 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 0c7fa8db01c5..0c7fa8db01c5 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 48abf5058dfe..48abf5058dfe 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 57130a7aa529..57130a7aa529 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/gpy/default.nix b/nixpkgs/pkgs/development/python-modules/gpy/default.nix
index 8bbcaed377a8..8bbcaed377a8 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/grammalecte/default.nix b/nixpkgs/pkgs/development/python-modules/grammalecte/default.nix
index 01c052bfdce8..01c052bfdce8 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 79413b26544f..79413b26544f 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 80e12e246ebb..80e12e246ebb 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 4b0e665de098..4b0e665de098 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 41c13b1fbd4c..41c13b1fbd4c 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 7f1726a2c4b9..7f1726a2c4b9 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 2d4a2f29bc43..2d4a2f29bc43 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 f49ebc3fb5d9..f49ebc3fb5d9 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 b94a92bc02fc..b94a92bc02fc 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 d2ab8d547fdb..d2ab8d547fdb 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 572fdcaee51a..572fdcaee51a 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 ad632974c28c..ad632974c28c 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 5a845f733f51..5a845f733f51 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/green/default.nix b/nixpkgs/pkgs/development/python-modules/green/default.nix
index 1493c78df834..1493c78df834 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 3754f08c28be..3754f08c28be 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 c42ace2e695b..c42ace2e695b 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 d812d58b74ca..d812d58b74ca 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 68ca4b04c0e0..68ca4b04c0e0 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 067b27c8ffd1..067b27c8ffd1 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 f16a5800bb44..f16a5800bb44 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 9d8814e65313..9d8814e65313 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/default.nix b/nixpkgs/pkgs/development/python-modules/gsd/default.nix
index 567cc6f8930d..567cc6f8930d 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 a2597b2e6e77..a2597b2e6e77 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 14d27e7442e2..14d27e7442e2 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 a26b02ee0300..a26b02ee0300 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 c729874846da..c729874846da 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 62d709aa9217..62d709aa9217 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 494860d4dc27..494860d4dc27 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 238a1e9980bd..238a1e9980bd 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 2937b876dec4..2937b876dec4 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 85c5c011dfd9..85c5c011dfd9 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 3bd3b3b2a329..3bd3b3b2a329 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 d572b10fd625..d572b10fd625 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 c71ac7d68632..c71ac7d68632 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 08b42b807999..08b42b807999 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 e27aed0627b3..e27aed0627b3 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 46b0dde636af..46b0dde636af 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 798d0f0b16d0..798d0f0b16d0 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 d202b7224744..d202b7224744 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 42ebf1b81da7..42ebf1b81da7 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 910080e679f7..910080e679f7 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/h5py/default.nix b/nixpkgs/pkgs/development/python-modules/h5py/default.nix
index 23e659ea7ae6..23e659ea7ae6 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 0b702901ae7f..0b702901ae7f 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 b58d4a300201..b58d4a300201 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/hawkauthlib/default.nix b/nixpkgs/pkgs/development/python-modules/hawkauthlib/default.nix
index 46e49ba6b88b..46e49ba6b88b 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 cd3264b78bb2..cd3264b78bb2 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/hcs_utils/default.nix b/nixpkgs/pkgs/development/python-modules/hcs_utils/default.nix
index cfaaa5636113..cfaaa5636113 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 02f888b175dc..02f888b175dc 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 3a573f69c700..3a573f69c700 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 34c01091ddf2..34c01091ddf2 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 8aa6e1e921fb..8aa6e1e921fb 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 2909d2c2a6c5..2909d2c2a6c5 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 452b946a0422..452b946a0422 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 eab8ffe2bfd8..eab8ffe2bfd8 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 2141aa32a139..2141aa32a139 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 056415df4f6e..056415df4f6e 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 2d78a45da8c0..2d78a45da8c0 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 9fa28126452a..9fa28126452a 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/hiro/default.nix b/nixpkgs/pkgs/development/python-modules/hiro/default.nix
index 4d9ebdb0129e..4d9ebdb0129e 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/histbook/default.nix b/nixpkgs/pkgs/development/python-modules/histbook/default.nix
index c9ea7010a6f0..c9ea7010a6f0 100644
--- a/pkgs/development/python-modules/histbook/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/histbook/default.nix
diff --git a/pkgs/development/python-modules/hkdf/default.nix b/nixpkgs/pkgs/development/python-modules/hkdf/default.nix
index 347cd94c8f51..347cd94c8f51 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 9938d4053879..9938d4053879 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/holoviews/default.nix b/nixpkgs/pkgs/development/python-modules/holoviews/default.nix
index bd0cbda48d8a..bd0cbda48d8a 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 5851d62842b6..5851d62842b6 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 c4afe809cfb6..c4afe809cfb6 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 4acf05b41426..4acf05b41426 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 53e42027ba22..53e42027ba22 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 a10882417fc0..a10882417fc0 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 d08d9e06b719..d08d9e06b719 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 06f89f733331..06f89f733331 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/html2text/default.nix b/nixpkgs/pkgs/development/python-modules/html2text/default.nix
index cac88c557946..cac88c557946 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 a09ed7b94208..a09ed7b94208 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 5a59b63cea41..5a59b63cea41 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 787163d477e3..787163d477e3 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 538b75c3dd02..538b75c3dd02 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 c2c7f4e12f42..c2c7f4e12f42 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 53447544ca92..53447544ca92 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 1f50608d3d1b..1f50608d3d1b 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 48f06db1ba5d..48f06db1ba5d 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 f1afd41ebed5..f1afd41ebed5 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 77dc27f1096e..77dc27f1096e 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 5a9e9f847471..5a9e9f847471 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 cf78a6185365..cf78a6185365 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 3bd61ec8afae..3bd61ec8afae 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 24ba9be13822..24ba9be13822 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 fc83675fd657..fc83675fd657 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/hug/default.nix b/nixpkgs/pkgs/development/python-modules/hug/default.nix
index 1b9542824c07..1b9542824c07 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 bef32f947c37..bef32f947c37 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 f1fac28dd939..f1fac28dd939 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 c6b0a2c64bc6..c6b0a2c64bc6 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 4eda2d864c83..4eda2d864c83 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 dfec9ffc2001..dfec9ffc2001 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/hypchat/default.nix b/nixpkgs/pkgs/development/python-modules/hypchat/default.nix
index 8337fd2230ba..8337fd2230ba 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 a8f847c53bb1..a8f847c53bb1 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 d7950d3adb69..d7950d3adb69 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 9c105ffe3fbe..9c105ffe3fbe 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 ea6e449947c5..ea6e449947c5 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 482a51a099ec..482a51a099ec 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/ibmquantumexperience/default.nix b/nixpkgs/pkgs/development/python-modules/ibmquantumexperience/default.nix
index dcf39dd24f02..dcf39dd24f02 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 48da3da6bc47..48da3da6bc47 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/identify/default.nix b/nixpkgs/pkgs/development/python-modules/identify/default.nix
index 8837e34c788e..8837e34c788e 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 a8a040d39e29..a8a040d39e29 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 5e5d623ff10e..5e5d623ff10e 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 e5087a105360..e5087a105360 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/ijson/default.nix b/nixpkgs/pkgs/development/python-modules/ijson/default.nix
index 149b07d63e3b..149b07d63e3b 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 49d1062abc31..49d1062abc31 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/imageio-ffmpeg/default.nix b/nixpkgs/pkgs/development/python-modules/imageio-ffmpeg/default.nix
index 5d07024656ec..5d07024656ec 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 f7b3ff63c53c..f7b3ff63c53c 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 6be9f76d380f..6be9f76d380f 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 e45cdb3eab8a..e45cdb3eab8a 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 0ceff353f9a6..0ceff353f9a6 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/default.nix b/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix
index 9020d2cc12ce..9020d2cc12ce 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 3946c0df6bc2..3946c0df6bc2 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 5662f8896cc3..5662f8896cc3 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/importlib-metadata/default.nix b/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix
index 59fdb35be125..59fdb35be125 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 f5769bf0b2d9..f5769bf0b2d9 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 0aa4a295f5df..0aa4a295f5df 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 0711283a1b83..0711283a1b83 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 c5530d7c1d09..c5530d7c1d09 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 a97a98b207a5..a97a98b207a5 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 147cc8753eb0..147cc8753eb0 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 bccf49c56adf..bccf49c56adf 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 657a8178440f..657a8178440f 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 eeb27b14080a..eeb27b14080a 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 ce265d013785..ce265d013785 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 e64ef76356d1..e64ef76356d1 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 e0c2fd765c98..e0c2fd765c98 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 2d5e9d780945..2d5e9d780945 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 58e7f61b6762..58e7f61b6762 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 c7f6e5c82194..c7f6e5c82194 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 20098485ad48..20098485ad48 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 dda0680f537e..dda0680f537e 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 ee81c40febc8..ee81c40febc8 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 b60eb0c73274..b60eb0c73274 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/invoke/default.nix b/nixpkgs/pkgs/development/python-modules/invoke/default.nix
index d2839d32b0a9..d2839d32b0a9 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 1e333d923a02..1e333d923a02 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 c67d56b153e0..c67d56b153e0 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 6aecf5959ff8..6aecf5959ff8 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 0ce2abff5965..0ce2abff5965 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 f31b9013d94b..f31b9013d94b 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 b092a9fa2aec..b092a9fa2aec 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 377ed8549cff..377ed8549cff 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 6b33edfca3c7..6b33edfca3c7 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 49dfbf6ad8ec..49dfbf6ad8ec 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 043f58cfa5d4..043f58cfa5d4 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 3fa1acb875ab..3fa1acb875ab 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 15e7d00bcece..15e7d00bcece 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/default.nix b/nixpkgs/pkgs/development/python-modules/ipython/default.nix
index f94b690b7f7b..f94b690b7f7b 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 0f3504780c2b..0f3504780c2b 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 b91b5d7a775b..b91b5d7a775b 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 b422b368ffb6..b422b368ffb6 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 319bf7f24a2f..319bf7f24a2f 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 6274da95b32f..6274da95b32f 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 fe6382f6fb63..fe6382f6fb63 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 c65c5f21e567..c65c5f21e567 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 4f9ff70556b4..4f9ff70556b4 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 425a295e5a53..425a295e5a53 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 979213f945be..979213f945be 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/itsdangerous/default.nix b/nixpkgs/pkgs/development/python-modules/itsdangerous/default.nix
index 4761a98dc301..4761a98dc301 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/j2cli/default.nix b/nixpkgs/pkgs/development/python-modules/j2cli/default.nix
index 98725ca4767e..98725ca4767e 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 6c04e6945de1..6c04e6945de1 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/jaraco_classes/default.nix b/nixpkgs/pkgs/development/python-modules/jaraco_classes/default.nix
index dadbb8104659..dadbb8104659 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 8fde41e9b499..8fde41e9b499 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 7fc90d63f695..7fc90d63f695 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 43530fcc3285..43530fcc3285 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 59d8538bb1e5..59d8538bb1e5 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 aab9604b9ce8..aab9604b9ce8 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 ae05a76da1d5..ae05a76da1d5 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 492d903f24dc..492d903f24dc 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 6087258a289b..6087258a289b 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/jdatetime/default.nix b/nixpkgs/pkgs/development/python-modules/jdatetime/default.nix
index 675dba0ea72f..675dba0ea72f 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 4fd89c83abc5..4fd89c83abc5 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 dbd87f232545..dbd87f232545 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 8b1100cd3f40..8b1100cd3f40 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 fa8ce7b62986..fa8ce7b62986 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 a41fefd7b136..a41fefd7b136 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 edfeb0a59714..edfeb0a59714 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 df21c0f41861..df21c0f41861 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 c8b7f740363d..c8b7f740363d 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 5f80f4e4b202..5f80f4e4b202 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 69fbffa92b2f..69fbffa92b2f 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 b9bc923e7e08..b9bc923e7e08 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 ccc47ac4b9cf..ccc47ac4b9cf 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 cc0a78872b2d..cc0a78872b2d 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 9b2a5c447327..9b2a5c447327 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 f968b9fbd9f5..f968b9fbd9f5 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/jq/default.nix b/nixpkgs/pkgs/development/python-modules/jq/default.nix
index adcdd2b9d823..adcdd2b9d823 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 53092b8a1f57..53092b8a1f57 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 15191858daa8..15191858daa8 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 f11fccb086bc..f11fccb086bc 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/jsondate/default.nix b/nixpkgs/pkgs/development/python-modules/jsondate/default.nix
index 7888a6df23cc..7888a6df23cc 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 fd31dc93fbfa..fd31dc93fbfa 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/jsonpatch/default.nix b/nixpkgs/pkgs/development/python-modules/jsonpatch/default.nix
index 52fc3bd5e043..52fc3bd5e043 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 a109404c06f5..a109404c06f5 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 a6ef8e3e1fb9..a6ef8e3e1fb9 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 6971393b80c9..6971393b80c9 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 c174a011b5fa..c174a011b5fa 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 d4bc1dd523d5..d4bc1dd523d5 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 35244e092da3..35244e092da3 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 eff4f41979a2..eff4f41979a2 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 4697fb0c1133..4697fb0c1133 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 81dcdc074739..81dcdc074739 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 db6be9f99182..db6be9f99182 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 177b0d4cfee9..177b0d4cfee9 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 6a350d59be6d..6a350d59be6d 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/junos-eznc/default.nix b/nixpkgs/pkgs/development/python-modules/junos-eznc/default.nix
index 6970efd0914a..6970efd0914a 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 a400dd4d18ce..a400dd4d18ce 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 b6d2a5e5a901..b6d2a5e5a901 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 a4dc719b7afd..a4dc719b7afd 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 440f22b13321..440f22b13321 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 f8cf8b3076a7..f8cf8b3076a7 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 e89154c0bc43..e89154c0bc43 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 7e7e9ae93a09..7e7e9ae93a09 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 8a228bebb0b0..8a228bebb0b0 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 b291a2b0d3b2..b291a2b0d3b2 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 db8c5b774e41..db8c5b774e41 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 15b53f523b57..15b53f523b57 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 b74e31c39f35..b74e31c39f35 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 f7ac30c28c51..f7ac30c28c51 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 9b219127069e..9b219127069e 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/kaa-base/default.nix b/nixpkgs/pkgs/development/python-modules/kaa-base/default.nix
index f0994cebe111..f0994cebe111 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 d78adf7fd39d..d78adf7fd39d 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 891aa3f33941..891aa3f33941 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 a1e795421b07..a1e795421b07 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 ba71e03ce991..ba71e03ce991 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 5a6cf80a8352..5a6cf80a8352 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 7d384ba7cc37..7d384ba7cc37 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/keepalive/default.nix b/nixpkgs/pkgs/development/python-modules/keepalive/default.nix
index c53bc25d198d..c53bc25d198d 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 bbe72befb6d2..bbe72befb6d2 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/keras-applications/default.nix b/nixpkgs/pkgs/development/python-modules/keras-applications/default.nix
index c6fdd21d2ebe..c6fdd21d2ebe 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 96c38f3cd89d..96c38f3cd89d 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 dde820876d81..dde820876d81 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 3d581d763a54..3d581d763a54 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/default.nix b/nixpkgs/pkgs/development/python-modules/keyring/default.nix
index e54283735a86..e54283735a86 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 3fe986fc3351..3fe986fc3351 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 a109659ebdde..a109659ebdde 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 494a4f8fc063..494a4f8fc063 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 c0c3b09e7b4b..c0c3b09e7b4b 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 687798735d3e..687798735d3e 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 9b96ae038ca5..9b96ae038ca5 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/knack/default.nix b/nixpkgs/pkgs/development/python-modules/knack/default.nix
index f8427cd7d177..f8427cd7d177 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 033ab8211350..033ab8211350 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 fef8345a980e..fef8345a980e 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 e7062bad5ee7..e7062bad5ee7 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 e154c5c9c0ee..e154c5c9c0ee 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/lammps-cython/default.nix b/nixpkgs/pkgs/development/python-modules/lammps-cython/default.nix
index 501e4adc21d6..501e4adc21d6 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 d73940e56a6d..d73940e56a6d 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 dcd90dd89bdd..dcd90dd89bdd 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 74703ff5c9df..74703ff5c9df 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 6de2af1e505e..6de2af1e505e 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 febd38acc63f..febd38acc63f 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 2873c8f96220..2873c8f96220 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/lazy-object-proxy/default.nix b/nixpkgs/pkgs/development/python-modules/lazy-object-proxy/default.nix
index 430e43a129b3..430e43a129b3 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 8f5cd7e7e881..8f5cd7e7e881 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 13fe196e471c..13fe196e471c 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 81301f337e62..81301f337e62 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 4eab700ff140..4eab700ff140 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 cb0a8bc63481..cb0a8bc63481 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 98cc3a42074c..98cc3a42074c 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/ledgerblue/default.nix b/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix
index 3f9f58b5203f..3f9f58b5203f 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 0fe3a11ae261..0fe3a11ae261 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 4d6336ce7573..4d6336ce7573 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 e55887a49f56..e55887a49f56 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 2fbe7207f4f7..2fbe7207f4f7 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 52cca5d36fb6..52cca5d36fb6 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 add1957dd6df..add1957dd6df 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 aed76728d7e4..aed76728d7e4 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 62877300a276..62877300a276 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 e6a493f7b641..e6a493f7b641 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 6babc6ae0145..6babc6ae0145 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 b707b3430568..b707b3430568 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 c258b8dd865c..c258b8dd865c 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 54b98cf21368..54b98cf21368 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 258c2d6932d5..258c2d6932d5 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 f0fbcf5f3116..f0fbcf5f3116 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/libsexy/default.nix b/nixpkgs/pkgs/development/python-modules/libsexy/default.nix
index 78e0dae2634c..78e0dae2634c 100644
--- a/pkgs/development/python-modules/libsexy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libsexy/default.nix
diff --git a/pkgs/development/python-modules/libsoundtouch/default.nix b/nixpkgs/pkgs/development/python-modules/libsoundtouch/default.nix
index 745f83fe5081..745f83fe5081 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 6c9987a5b8e8..6c9987a5b8e8 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 d1220a6abbf3..d1220a6abbf3 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 b63704bf8e08..b63704bf8e08 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 e57411764267..e57411764267 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 f4a07b9635f0..f4a07b9635f0 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/lightblue/default.nix b/nixpkgs/pkgs/development/python-modules/lightblue/default.nix
index f826bbecb0a3..f826bbecb0a3 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/lightning/default.nix b/nixpkgs/pkgs/development/python-modules/lightning/default.nix
index d0e1a10ae008..d0e1a10ae008 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/limitlessled/default.nix b/nixpkgs/pkgs/development/python-modules/limitlessled/default.nix
index c2029aa6d6bd..c2029aa6d6bd 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 57f47ff5fd82..57f47ff5fd82 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 604f9bad3c36..604f9bad3c36 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 256cf107c86b..256cf107c86b 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/linecache2/default.nix b/nixpkgs/pkgs/development/python-modules/linecache2/default.nix
index 9890d382742c..9890d382742c 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 4689050ba6c7..4689050ba6c7 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 d0c8b0ff7943..d0c8b0ff7943 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 e5b8fe6f34c4..e5b8fe6f34c4 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 e329f36a7169..e329f36a7169 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 bf3b2cc1164c..bf3b2cc1164c 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 a316edaf80aa..a316edaf80aa 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 7f9aa3fa2e48..7f9aa3fa2e48 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 e70438a8817d..e70438a8817d 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 3b384182ae03..3b384182ae03 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 bc91139728b0..bc91139728b0 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 a4d7a8ce7062..a4d7a8ce7062 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 15cfee67f84a..15cfee67f84a 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 18875f840644..18875f840644 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 a52f194b8bea..a52f194b8bea 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 9f932b81e7ab..9f932b81e7ab 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 aa26f21820b7..aa26f21820b7 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 53284d122287..53284d122287 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 e4b57e4ce40c..e4b57e4ce40c 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 a0bc3a887459..a0bc3a887459 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 ce48978d6776..ce48978d6776 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 098d9f3e06d8..098d9f3e06d8 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 fe765f5ff0a8..fe765f5ff0a8 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 dd40ac851865..dd40ac851865 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 2277a2be92fb..2277a2be92fb 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 1c707b320310..1c707b320310 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 037644f60b21..037644f60b21 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 a078d33a8895..a078d33a8895 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 816b3a676828..816b3a676828 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 cfd30082c1c8..cfd30082c1c8 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 97ee57fac0c5..97ee57fac0c5 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 612e2fd76b2c..612e2fd76b2c 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/macfsevents/default.nix b/nixpkgs/pkgs/development/python-modules/macfsevents/default.nix
index 8dfa0038cdde..8dfa0038cdde 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 952740d78376..952740d78376 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 4347f07d9c2c..4347f07d9c2c 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 5ddece686faf..5ddece686faf 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 7f8241196e0e..7f8241196e0e 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 41c932ed1117..41c932ed1117 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 34e2260109be..34e2260109be 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 f19bd329e662..f19bd329e662 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 1f06f7f250a9..1f06f7f250a9 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 886a3ed66b37..886a3ed66b37 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 b9640a4ab5d5..b9640a4ab5d5 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 1a16e253f298..1a16e253f298 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-rss/default.nix b/nixpkgs/pkgs/development/python-modules/mailman-rss/default.nix
index afce4521d5b4..afce4521d5b4 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/manhole/default.nix b/nixpkgs/pkgs/development/python-modules/manhole/default.nix
index c8b77e9668f2..c8b77e9668f2 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 f9fa3a090ebe..f9fa3a090ebe 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/mapsplotlib/default.nix b/nixpkgs/pkgs/development/python-modules/mapsplotlib/default.nix
index a046cfd96102..a046cfd96102 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 ff1a6e49b013..ff1a6e49b013 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 7316526aa280..7316526aa280 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 b6d761f077ce..b6d761f077ce 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 3f7710acb3c1..3f7710acb3c1 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 02da75bfd965..02da75bfd965 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 34350dd4821f..34350dd4821f 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 6862967e420f..6862967e420f 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 d44dc108ff3d..d44dc108ff3d 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 b8d0c077d664..b8d0c077d664 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 3901f7c310d0..3901f7c310d0 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 e8130e8038fd..e8130e8038fd 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 3620248904ce..3620248904ce 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 ac8631362fb8..ac8631362fb8 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 2ff50e1fa92e..2ff50e1fa92e 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 dbe3cb4bc2d8..dbe3cb4bc2d8 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 71be4f5726d1..71be4f5726d1 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 006e3a9051be..006e3a9051be 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 98dce9130464..98dce9130464 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 364fa4d81be2..364fa4d81be2 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 a07e0b14fdce..a07e0b14fdce 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 1212651aec81..1212651aec81 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 640b11a6f280..640b11a6f280 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 d15aa82c3a90..d15aa82c3a90 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-sqlalchemy/default.nix b/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
index 22f9b445d24f..22f9b445d24f 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 513c277bcacb..513c277bcacb 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 a9f37b52c1b4..a9f37b52c1b4 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 b20cc0709092..b20cc0709092 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 5a45b02a240b..5a45b02a240b 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 0a84a05bbaea..0a84a05bbaea 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 bb7e75449c84..bb7e75449c84 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 19c4baca8b29..19c4baca8b29 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/mautrix-appservice/default.nix b/nixpkgs/pkgs/development/python-modules/mautrix-appservice/default.nix
index ba96e7d734be..ba96e7d734be 100644
--- a/pkgs/development/python-modules/mautrix-appservice/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mautrix-appservice/default.nix
diff --git a/pkgs/development/python-modules/maxminddb/default.nix b/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix
index c24823d1812a..c24823d1812a 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 9c6cb241fea5..9c6cb241fea5 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 520e872c91e9..520e872c91e9 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 9fbaced9b657..9fbaced9b657 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/mecab-python3/default.nix b/nixpkgs/pkgs/development/python-modules/mecab-python3/default.nix
index df691fb05c80..df691fb05c80 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 f23c3c9e20b7..f23c3c9e20b7 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 526cd3ed4eec..526cd3ed4eec 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 018a634a43a6..018a634a43a6 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 b0cdbd60c3e2..b0cdbd60c3e2 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 854f7440daa1..854f7440daa1 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 e0367e6c5051..e0367e6c5051 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/metaphone/default.nix b/nixpkgs/pkgs/development/python-modules/metaphone/default.nix
index e167ee494a82..e167ee494a82 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 a831618134bc..a831618134bc 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 d3b5c79e967a..d3b5c79e967a 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 0b9945f97d3d..0b9945f97d3d 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 014bb223225d..014bb223225d 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 209ecf998ccf..209ecf998ccf 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 856f7b45adf4..856f7b45adf4 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 f5a37832e8fc..f5a37832e8fc 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 d267cb6a9762..d267cb6a9762 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 85511d3ad252..85511d3ad252 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 75011a8219fe..75011a8219fe 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 6a99913c6c8b..6a99913c6c8b 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/mlrose/default.nix b/nixpkgs/pkgs/development/python-modules/mlrose/default.nix
index f7d43115a1b5..f7d43115a1b5 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 0a41b6e3c87d..0a41b6e3c87d 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 182bbf3f0758..182bbf3f0758 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/mock-open/default.nix b/nixpkgs/pkgs/development/python-modules/mock-open/default.nix
index edb3407270f2..edb3407270f2 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 8ab724144f7f..8ab724144f7f 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 bfef79b0f722..bfef79b0f722 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/moderngl/default.nix b/nixpkgs/pkgs/development/python-modules/moderngl/default.nix
index 8040b80f88b8..8040b80f88b8 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/modestmaps/default.nix b/nixpkgs/pkgs/development/python-modules/modestmaps/default.nix
index b25e6f5644ed..b25e6f5644ed 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 cc00643b71ae..cc00643b71ae 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 e9856eeffca6..e9856eeffca6 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 932160bb9fad..932160bb9fad 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/monotonic/default.nix b/nixpkgs/pkgs/development/python-modules/monotonic/default.nix
index c784730da6e8..c784730da6e8 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 4675a3860549..4675a3860549 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 e0786aefa2c2..e0786aefa2c2 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 999708697a94..999708697a94 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 bdfb9e2efcae..bdfb9e2efcae 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 c8f1a0cbd086..c8f1a0cbd086 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 73c2f6c8e684..73c2f6c8e684 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 d9b5a5aa111e..d9b5a5aa111e 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 be6a4c7c8a5d..be6a4c7c8a5d 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 a7b3984b912e..a7b3984b912e 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 c7f2b4cbc349..c7f2b4cbc349 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 48693293458e..48693293458e 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 3669b8dddbf8..3669b8dddbf8 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 e2028d9332b0..e2028d9332b0 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 168e3b4b38d3..168e3b4b38d3 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 62c5282b335b..62c5282b335b 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 9da56cad8815..9da56cad8815 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 4a3ff00f8352..4a3ff00f8352 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 cd9ca9451b8b..cd9ca9451b8b 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 5660e1b0dc5c..5660e1b0dc5c 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 388e0148d0a0..388e0148d0a0 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/msgpack-numpy/default.nix b/nixpkgs/pkgs/development/python-modules/msgpack-numpy/default.nix
index 45b64355e45b..45b64355e45b 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 d48d0995a764..d48d0995a764 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 ba3dd00bfe49..ba3dd00bfe49 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 0ef06cd8fb15..0ef06cd8fb15 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 32a759a6a49e..32a759a6a49e 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 f3965b8a74ae..f3965b8a74ae 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 a094b373f8f3..a094b373f8f3 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 76a494230066..76a494230066 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 8b2de6c5af19..8b2de6c5af19 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 a98697039a86..a98697039a86 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 5cc159dc2059..5cc159dc2059 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 f4ecc2ff3061..f4ecc2ff3061 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 5e83818a0143..5e83818a0143 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 2e826ab61e81..2e826ab61e81 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 0f18163883e8..0f18163883e8 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 3fbb36a37188..3fbb36a37188 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 0bd08a82b937..0bd08a82b937 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 904284e5b332..904284e5b332 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 b100f3fa3500..b100f3fa3500 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 cfcbdc2d0ac3..cfcbdc2d0ac3 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 21820d95c7fa..21820d95c7fa 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 55a19e1a6da3..55a19e1a6da3 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 d22bd460f5f5..d22bd460f5f5 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/mxnet/default.nix b/nixpkgs/pkgs/development/python-modules/mxnet/default.nix
index f2e38a0e9b3b..f2e38a0e9b3b 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/mygpoclient/default.nix b/nixpkgs/pkgs/development/python-modules/mygpoclient/default.nix
index 5f30316eb711..5f30316eb711 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 a06a378a0768..a06a378a0768 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 c5ca8e1f4b57..c5ca8e1f4b57 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 36407fd684ae..36407fd684ae 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 efddecd42469..efddecd42469 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/mysql_python/default.nix b/nixpkgs/pkgs/development/python-modules/mysql_python/default.nix
index 0ab11521cc88..0ab11521cc88 100644
--- a/pkgs/development/python-modules/mysql_python/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mysql_python/default.nix
diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/nixpkgs/pkgs/development/python-modules/mysqlclient/default.nix
index c43c45df600c..c43c45df600c 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/namebench/default.nix b/nixpkgs/pkgs/development/python-modules/namebench/default.nix
index a930f250d80c..a930f250d80c 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 ae07076bb057..ae07076bb057 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 91e6e5f0fd6a..91e6e5f0fd6a 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/nanoleaf/default.nix b/nixpkgs/pkgs/development/python-modules/nanoleaf/default.nix
index ccf0be4ae6d2..ccf0be4ae6d2 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 b6e323ff9c69..b6e323ff9c69 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 8dd520a04e9a..8dd520a04e9a 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 da8e953826ff..da8e953826ff 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/nbconvert/default.nix b/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix
index 11552a7c342e..11552a7c342e 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/nbformat/default.nix b/nixpkgs/pkgs/development/python-modules/nbformat/default.nix
index 8b16ffb7e32b..8b16ffb7e32b 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 c0485eef4d3d..c0485eef4d3d 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 ee4434c1d1d7..ee4434c1d1d7 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 ad6de3d31758..ad6de3d31758 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 c9ab72894efe..c9ab72894efe 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 0b0220d32460..0b0220d32460 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 10baadcab302..10baadcab302 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 d9c7e41c576f..d9c7e41c576f 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 0d5923820d27..0d5923820d27 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 59c13bc0a633..59c13bc0a633 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 ed56e6803f4c..ed56e6803f4c 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 ee5110995b01..ee5110995b01 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 1c9af258995d..1c9af258995d 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 1f1cc3857e41..1f1cc3857e41 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/default.nix b/nixpkgs/pkgs/development/python-modules/networkx/default.nix
index 85b53bd9df68..85b53bd9df68 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 1d258effda7d..1d258effda7d 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/neurotools/default.nix b/nixpkgs/pkgs/development/python-modules/neurotools/default.nix
index b117d7a79a37..b117d7a79a37 100644
--- a/pkgs/development/python-modules/neurotools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/neurotools/default.nix
diff --git a/pkgs/development/python-modules/nevow/default.nix b/nixpkgs/pkgs/development/python-modules/nevow/default.nix
index fa11ab3fb907..fa11ab3fb907 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 76494c70b2ea..76494c70b2ea 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/nilearn/default.nix b/nixpkgs/pkgs/development/python-modules/nilearn/default.nix
index e45a0033c82a..e45a0033c82a 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 26f1ea3294bb..26f1ea3294bb 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 8882b6ae7456..8882b6ae7456 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 5b8c1e5185da..5b8c1e5185da 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 42fb2de9dca6..42fb2de9dca6 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 3042f7156879..3042f7156879 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/nixpkgs-pytools/default.nix b/nixpkgs/pkgs/development/python-modules/nixpkgs-pytools/default.nix
index 4a943e32d4c5..4a943e32d4c5 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 75dcf9b32c4c..75dcf9b32c4c 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 7e3134a44d20..7e3134a44d20 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/node-semver/default.nix b/nixpkgs/pkgs/development/python-modules/node-semver/default.nix
index 34a81a66ec9d..34a81a66ec9d 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 042ee1e3e616..042ee1e3e616 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 d136c41aa370..d136c41aa370 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 1d3d6179ae63..1d3d6179ae63 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 273c0ab042f9..273c0ab042f9 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 c8bc7dbaf682..c8bc7dbaf682 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 7eb6b6cc0474..7eb6b6cc0474 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 ef86a35b3041..ef86a35b3041 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 7a783da31177..7a783da31177 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 24d74b938afb..24d74b938afb 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 23315f9531b2..23315f9531b2 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 bec5156d22e0..bec5156d22e0 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 e708ff2ee3e7..e708ff2ee3e7 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 6d9d98f27abd..6d9d98f27abd 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 2b1ee207cfed..2b1ee207cfed 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 c2d3ee94c7b5..c2d3ee94c7b5 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 2fb698388795..2fb698388795 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/default.nix b/nixpkgs/pkgs/development/python-modules/notebook/default.nix
index 556fcfb31f5f..556fcfb31f5f 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/notify/default.nix b/nixpkgs/pkgs/development/python-modules/notify/default.nix
index 5dd953808910..5dd953808910 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 2d5851929075..2d5851929075 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 ec641420f652..ec641420f652 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 e4bbe0fb4302..e4bbe0fb4302 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 d6506ae4b4ad..d6506ae4b4ad 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 b8d9f7d58a93..b8d9f7d58a93 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/numba/default.nix b/nixpkgs/pkgs/development/python-modules/numba/default.nix
index ebb7aac39241..ebb7aac39241 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/numericalunits/default.nix b/nixpkgs/pkgs/development/python-modules/numericalunits/default.nix
index 41b4c1a8f318..41b4c1a8f318 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 78203b3571bb..78203b3571bb 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 4c2af8a00814..4c2af8a00814 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 d82adaeea289..d82adaeea289 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 771da8cf3ffa..771da8cf3ffa 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 0e6fa25bd537..0e6fa25bd537 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 a0262c775954..a0262c775954 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 f21624acf143..f21624acf143 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 7fb1de53dbd9..7fb1de53dbd9 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 c28f22aa5ec9..c28f22aa5ec9 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/oauth/default.nix b/nixpkgs/pkgs/development/python-modules/oauth/default.nix
index a8e5c8bf53d2..a8e5c8bf53d2 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 8233b132344f..8233b132344f 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 8500b53b244c..8500b53b244c 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 85dc80681aad..85dc80681aad 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 cdf88db632ca..cdf88db632ca 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 8abd3f22ea3d..8abd3f22ea3d 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 c0e0cddb2c80..c0e0cddb2c80 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 c5be5de64eed..c5be5de64eed 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 0aaa40e17582..0aaa40e17582 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 c62f6ae681c2..c62f6ae681c2 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 f18420b676b7..f18420b676b7 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 e098ecc8c31d..e098ecc8c31d 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 2bde7b174d33..2bde7b174d33 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 518c34951fce..518c34951fce 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 fbdafc291dc5..fbdafc291dc5 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 adcb640df139..adcb640df139 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 ff4aba83bc80..ff4aba83bc80 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/onkyo-eiscp/default.nix b/nixpkgs/pkgs/development/python-modules/onkyo-eiscp/default.nix
index 7b5622cfeefb..7b5622cfeefb 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/openant/default.nix b/nixpkgs/pkgs/development/python-modules/openant/default.nix
index 116ba717add6..116ba717add6 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/openidc-client/default.nix b/nixpkgs/pkgs/development/python-modules/openidc-client/default.nix
index e0eb1ac8d796..e0eb1ac8d796 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/default.nix b/nixpkgs/pkgs/development/python-modules/openpyxl/default.nix
index ea12f1cc35a3..ea12f1cc35a3 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/opentimestamps/default.nix b/nixpkgs/pkgs/development/python-modules/opentimestamps/default.nix
index 01f5595fea10..01f5595fea10 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/opt-einsum/default.nix b/nixpkgs/pkgs/development/python-modules/opt-einsum/default.nix
index c28105d4e492..c28105d4e492 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/ordered-set/default.nix b/nixpkgs/pkgs/development/python-modules/ordered-set/default.nix
index 924a2d31b769..924a2d31b769 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 9c028777fc9f..9c028777fc9f 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 f1e6f1bf918e..f1e6f1bf918e 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/osc/default.nix b/nixpkgs/pkgs/development/python-modules/osc/default.nix
index 7e6207697595..7e6207697595 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/oset/default.nix b/nixpkgs/pkgs/development/python-modules/oset/default.nix
index aa435b403e8b..aa435b403e8b 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 ae4e8a039711..ae4e8a039711 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 dc06ab63d2d9..dc06ab63d2d9 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 017f75d991ce..017f75d991ce 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 73230b2e8fb3..73230b2e8fb3 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 22b9360a56a0..22b9360a56a0 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/packaging/default.nix b/nixpkgs/pkgs/development/python-modules/packaging/default.nix
index 2d12b32b438c..2d12b32b438c 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 61d387590480..61d387590480 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 75a16f5c53be..75a16f5c53be 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 d3f47dad3ca2..d3f47dad3ca2 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 bf7ebee56577..bf7ebee56577 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 6b2113352b46..6b2113352b46 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 9a55719d77f3..9a55719d77f3 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 07eab3b7bc92..07eab3b7bc92 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/default.nix b/nixpkgs/pkgs/development/python-modules/pandas/default.nix
index 7416717585f1..7416717585f1 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/pandocfilters/default.nix b/nixpkgs/pkgs/development/python-modules/pandocfilters/default.nix
index a6edb89dcabd..a6edb89dcabd 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 fccd46c605db..fccd46c605db 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/paperspace/default.nix b/nixpkgs/pkgs/development/python-modules/paperspace/default.nix
index 6f73004deeb9..6f73004deeb9 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 1344e1588cd5..1344e1588cd5 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 b2ae7cf73ed9..b2ae7cf73ed9 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 69a2e61e2690..69a2e61e2690 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 8d13fcfb4d54..8d13fcfb4d54 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 a1ecced51eb5..a1ecced51eb5 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 0183379ac004..0183379ac004 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/parse-type/default.nix b/nixpkgs/pkgs/development/python-modules/parse-type/default.nix
index 34573626baca..34573626baca 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 2bbf92f40d46..2bbf92f40d46 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 32247fcc3882..32247fcc3882 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 82d9107bfdde..82d9107bfdde 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 69e6d1d2bb2c..69e6d1d2bb2c 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/parso/default.nix b/nixpkgs/pkgs/development/python-modules/parso/default.nix
index f5ecb64d2321..f5ecb64d2321 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 4183f30caad9..4183f30caad9 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 c7691df6b118..c7691df6b118 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 c71e39ca111a..c71e39ca111a 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 24539c7bbcef..24539c7bbcef 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 21e5a04c3916..21e5a04c3916 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 3301521b085e..3301521b085e 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 532970c62c28..532970c62c28 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 fe89e6e5aeab..fe89e6e5aeab 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 46601c167553..46601c167553 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 1a7ce9539476..1a7ce9539476 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 55d7afd9fa46..55d7afd9fa46 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/default.nix b/nixpkgs/pkgs/development/python-modules/path.py/default.nix
index 318642a393a3..318642a393a3 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 d70178dac857..d70178dac857 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 7669e03cf6f0..7669e03cf6f0 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 814854596e9d..814854596e9d 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 39a2789a360f..39a2789a360f 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 8709662e6a18..8709662e6a18 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 a21b4027bbb2..a21b4027bbb2 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 17ae2428b87a..17ae2428b87a 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 dbc918e6c0dc..dbc918e6c0dc 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 c83cada08f2e..c83cada08f2e 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 c3d5ba170e3f..c3d5ba170e3f 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 d21d9d07150d..d21d9d07150d 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/pdf2image/default.nix b/nixpkgs/pkgs/development/python-modules/pdf2image/default.nix
index 6d0cafd5f803..6d0cafd5f803 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 c797c57c40f9..c797c57c40f9 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 4c0086869f74..4c0086869f74 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 6c3b1c0cb925..6c3b1c0cb925 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 d2397fb5c82b..d2397fb5c82b 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 9f3c009f8c12..9f3c009f8c12 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 bfc9f5a1f7c6..bfc9f5a1f7c6 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/pelican/default.nix b/nixpkgs/pkgs/development/python-modules/pelican/default.nix
index f593c5dbeea3..f593c5dbeea3 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 c3090f959008..c3090f959008 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 fc1028a0d1c1..fc1028a0d1c1 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/default.nix b/nixpkgs/pkgs/development/python-modules/pep8/default.nix
index 12176b97380d..12176b97380d 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 1fb661d53e79..1fb661d53e79 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 9523a3e28fab..9523a3e28fab 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/perf/default.nix b/nixpkgs/pkgs/development/python-modules/perf/default.nix
index 6c209ba8da02..6c209ba8da02 100644
--- a/pkgs/development/python-modules/perf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/perf/default.nix
diff --git a/pkgs/development/python-modules/perfplot/default.nix b/nixpkgs/pkgs/development/python-modules/perfplot/default.nix
index 4e451e816c0a..4e451e816c0a 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 e77c281e2c49..e77c281e2c49 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/persistent/default.nix b/nixpkgs/pkgs/development/python-modules/persistent/default.nix
index 88008cd9530a..88008cd9530a 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/pex/default.nix b/nixpkgs/pkgs/development/python-modules/pex/default.nix
index 4d064af18fa7..4d064af18fa7 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 ac1c7de86820..ac1c7de86820 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 0116212ad9ea..0116212ad9ea 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 efeee5e077fb..efeee5e077fb 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 7ea154255c10..7ea154255c10 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 bfa6c301a7ba..bfa6c301a7ba 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 ea9ef0a156f0..ea9ef0a156f0 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/pgsanity/default.nix b/nixpkgs/pkgs/development/python-modules/pgsanity/default.nix
index 85db917cef82..85db917cef82 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 8c653ce060aa..8c653ce060aa 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 b016a9bd92c3..b016a9bd92c3 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/phonenumbers/default.nix b/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix
index f30a73be8fb3..f30a73be8fb3 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 026d466d2185..026d466d2185 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 0ddeb99f10b1..0ddeb99f10b1 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 bd00b2f6d557..bd00b2f6d557 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 b46207ae33df..b46207ae33df 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/pid/default.nix b/nixpkgs/pkgs/development/python-modules/pid/default.nix
index 680094357500..680094357500 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 0ef44f981757..0ef44f981757 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 0de96a3f585e..0de96a3f585e 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 5007fc78d10f..5007fc78d10f 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 073c292c84d2..073c292c84d2 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/pilkit/default.nix b/nixpkgs/pkgs/development/python-modules/pilkit/default.nix
index 0f2a2bb4a8b7..0f2a2bb4a8b7 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 e0791248e266..e0791248e266 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 879ebe252d7f..879ebe252d7f 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 4504886d03d0..4504886d03d0 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 8bbda8bd51f1..8bbda8bd51f1 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 a9054b2ed857..a9054b2ed857 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 76f3b0b7176b..76f3b0b7176b 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 0e648f1ca184..0e648f1ca184 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 8628705ed4d6..8628705ed4d6 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 9ff1094aec13..9ff1094aec13 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 ab8c2f638b41..ab8c2f638b41 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 79fca7a44f1b..79fca7a44f1b 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 879274a16c32..879274a16c32 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 d0e7b0d81eec..d0e7b0d81eec 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 8577441cf9d2..8577441cf9d2 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 e794b53950ee..e794b53950ee 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 82aaebb10039..82aaebb10039 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/plone-testing/default.nix b/nixpkgs/pkgs/development/python-modules/plone-testing/default.nix
index ff4020a920b9..ff4020a920b9 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 f5be6ec308e9..f5be6ec308e9 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 331ba8673dd6..331ba8673dd6 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 c0d44e2851e2..c0d44e2851e2 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 13afce05ef77..13afce05ef77 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 ae55cac642f5..ae55cac642f5 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 3f6f3ab13bf3..3f6f3ab13bf3 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 2b18d114f3f6..2b18d114f3f6 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 b66d32311461..b66d32311461 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 e351d26ca481..e351d26ca481 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 d2fc1093844e..d2fc1093844e 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 8af9e759c953..8af9e759c953 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 d7e2a1db2ffb..d7e2a1db2ffb 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 ca7d203492dd..ca7d203492dd 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/poetry/jsonschema.nix b/nixpkgs/pkgs/development/python-modules/poetry/jsonschema.nix
index 35607b536f34..35607b536f34 100644
--- a/pkgs/development/python-modules/poetry/jsonschema.nix
+++ b/nixpkgs/pkgs/development/python-modules/poetry/jsonschema.nix
diff --git a/pkgs/development/python-modules/polib/default.nix b/nixpkgs/pkgs/development/python-modules/polib/default.nix
index 2e3928b742c1..2e3928b742c1 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/pomegranate/default.nix b/nixpkgs/pkgs/development/python-modules/pomegranate/default.nix
index e611e2ea5b10..e611e2ea5b10 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/poppler-qt5/default.nix b/nixpkgs/pkgs/development/python-modules/poppler-qt5/default.nix
index 2b00a007f90b..2b00a007f90b 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 7106c1d6352c..7106c1d6352c 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 c9f44dbccebc..c9f44dbccebc 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/default.nix b/nixpkgs/pkgs/development/python-modules/portend/default.nix
index a8dc0e9907af..a8dc0e9907af 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 30ac00155604..30ac00155604 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 c152b1537ecd..c152b1537ecd 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/potr/default.nix b/nixpkgs/pkgs/development/python-modules/potr/default.nix
index ba5ede1ad771..ba5ede1ad771 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 a54bd025dc7c..a54bd025dc7c 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 b35c9de19dcc..b35c9de19dcc 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 18aa9cb7369d..18aa9cb7369d 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 26dcd244c510..26dcd244c510 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 770b3a5a73e0..770b3a5a73e0 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 a693c8cad4cc..a693c8cad4cc 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 daf9d0062fb2..daf9d0062fb2 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/praw/default.nix b/nixpkgs/pkgs/development/python-modules/praw/default.nix
index 2a3d85c2b35b..2a3d85c2b35b 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 282e8bac069e..282e8bac069e 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/precis-i18n/default.nix b/nixpkgs/pkgs/development/python-modules/precis-i18n/default.nix
index 4c50aaee706a..4c50aaee706a 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 b88366de88fa..b88366de88fa 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 14fa0d2f59d4..14fa0d2f59d4 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 287b1294b5fe..287b1294b5fe 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 fed0499624af..fed0499624af 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 be0fb7e4023a..be0fb7e4023a 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 174dbc2b199c..f028953c28ab 100644
--- a/pkgs/development/python-modules/priority/deadline.patch
+++ b/nixpkgs/pkgs/development/python-modules/priority/deadline.patch
@@ -18,9 +18,9 @@ index c98a28d..013ce30 100644
 --- a/test/test_priority.py
 +++ b/test/test_priority.py
 @@ -12,7 +12,7 @@ import itertools
- 
+
  import pytest
- 
+
 -from hypothesis import given
 +from hypothesis import given, settings
  from hypothesis.strategies import (
@@ -34,6 +34,6 @@ index c98a28d..013ce30 100644
      def test_period_of_repetition(self, streams_and_weights):
          """
          The period of repetition of a priority sequence is given by the sum of
--- 
+--
 2.19.2
 
diff --git a/pkgs/development/python-modules/priority/default.nix b/nixpkgs/pkgs/development/python-modules/priority/default.nix
index f6e7efb78c20..f6e7efb78c20 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/proboscis/default.nix b/nixpkgs/pkgs/development/python-modules/proboscis/default.nix
index 3d99d9530f38..3d99d9530f38 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 5ab27b67da40..5ab27b67da40 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 d6fe22e17545..d6fe22e17545 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 d6c8d9125d16..d6c8d9125d16 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 fcd802b34875..fcd802b34875 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 e348ace06b4f..e348ace06b4f 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 f98259617545..f98259617545 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 f3b94436d452..f3b94436d452 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 67b828387980..67b828387980 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 133a1096863f..133a1096863f 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 78db87ce3cbe..78db87ce3cbe 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/protobuf/default.nix b/nixpkgs/pkgs/development/python-modules/protobuf/default.nix
index 69dce2723ebb..69dce2723ebb 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 c6cb98e33b2f..c6cb98e33b2f 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/psd-tools/default.nix b/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix
index 5f6c23beb028..5f6c23beb028 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 37c19f5c14bd..37c19f5c14bd 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 dae97d87ef2a..dae97d87ef2a 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 02429f589cfc..02429f589cfc 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 bdd9fc5c47e1..bdd9fc5c47e1 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 d48e42ef2646..d48e42ef2646 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 5de528ccd403..5de528ccd403 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 9c90161c6eaa..9c90161c6eaa 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 bcba04fdfd27..bcba04fdfd27 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 aacac72d2aaa..aacac72d2aaa 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 51db97835553..51db97835553 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 ece893874939..ece893874939 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/pushbullet/default.nix b/nixpkgs/pkgs/development/python-modules/pushbullet/default.nix
index 74c0f66b91eb..74c0f66b91eb 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 3ff449037ea7..3ff449037ea7 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 91af07b49be3..91af07b49be3 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 13f237750deb..13f237750deb 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 da7ddbc7dcb7..da7ddbc7dcb7 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 c90f81ae28f8..c90f81ae28f8 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 b1d8c4f2946d..b1d8c4f2946d 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 b06de3a27a7f..b06de3a27a7f 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 d5af1c1c33dd..d5af1c1c33dd 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 20d3eb31b0f7..20d3eb31b0f7 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/py3dns/default.nix b/nixpkgs/pkgs/development/python-modules/py3dns/default.nix
index 7ac093cbc577..7ac093cbc577 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 d3ed2659f6a6..d3ed2659f6a6 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 8b0619c5bc5f..8b0619c5bc5f 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 31d31f714b70..31d31f714b70 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 a442dfa097b9..a442dfa097b9 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 be409e348ea3..be409e348ea3 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/py_scrypt/default.nix b/nixpkgs/pkgs/development/python-modules/py_scrypt/default.nix
index 0c2d5eb5c02b..0c2d5eb5c02b 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 16b98320e8e4..16b98320e8e4 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 29cdfbc65990..29cdfbc65990 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 5ca837cdee48..5ca837cdee48 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 010c2805d2b6..010c2805d2b6 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 7602caf24cf1..7602caf24cf1 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 5ac6ef82964c..5ac6ef82964c 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/pyaml/default.nix b/nixpkgs/pkgs/development/python-modules/pyaml/default.nix
index 927963cec8d2..927963cec8d2 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 db48bb06bc0f..db48bb06bc0f 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 44acbe5c7a9d..44acbe5c7a9d 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 446ec81bb4f8..446ec81bb4f8 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 f44cfef8a29e..f44cfef8a29e 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 13f8efbb5813..13f8efbb5813 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 693477d20c08..693477d20c08 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 783a36dd2ded..783a36dd2ded 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 2f788966718c..2f788966718c 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 2279f7928181..2279f7928181 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 1034c9d844d9..1034c9d844d9 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 afc353d182c4..afc353d182c4 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 8f074943dd32..8f074943dd32 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/pybind11/default.nix b/nixpkgs/pkgs/development/python-modules/pybind11/default.nix
index f49c50185db7..f49c50185db7 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 4d8d0589edae..4d8d0589edae 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 e106ee3f3f18..e106ee3f3f18 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 eb6de23e0eaa..eb6de23e0eaa 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 dfb3e94ba276..dfb3e94ba276 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 6ceca20fdd17..6ceca20fdd17 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 180b7c8d18f5..180b7c8d18f5 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 946fb1a054fe..946fb1a054fe 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 45d907df2233..45d907df2233 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 dd258f427188..dd258f427188 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 5a1d8d370c18..5a1d8d370c18 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 08a68b814866..08a68b814866 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 ca6f72847158..ca6f72847158 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 9a6a3f4be2e9..9a6a3f4be2e9 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 80b17034aa03..80b17034aa03 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 629fdd0114d8..629fdd0114d8 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 a9864a0f0953..a9864a0f0953 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 c5c6182e4e06..c5c6182e4e06 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 f68a10d6186e..f68a10d6186e 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 d5b6805c2bb0..d5b6805c2bb0 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 55f30f9e55a9..55f30f9e55a9 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 f3b4d2548181..f3b4d2548181 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 4a5577d7e0bb..4a5577d7e0bb 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 259c87347d72..259c87347d72 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 51ce6241bb9c..51ce6241bb9c 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 ef5996f32c78..ef5996f32c78 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/pycodestyle/default.nix b/nixpkgs/pkgs/development/python-modules/pycodestyle/default.nix
index 286f42e2f30b..286f42e2f30b 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 23ed4917cc58..23ed4917cc58 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 7594c7c1e570..7594c7c1e570 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 ad49e38d0658..ad49e38d0658 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 b946740ff927..b946740ff927 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 4845c625652f..4845c625652f 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 e9ea8646b415..e9ea8646b415 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 e7858888d361..e7858888d361 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 e4b66b907cae..e4b66b907cae 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 62613c747654..62613c747654 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 8bb472d8fde7..8bb472d8fde7 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 fc61d689329e..fc61d689329e 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 192d60cec46a..192d60cec46a 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 5f58101a8b53..5f58101a8b53 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 28dff352e389..28dff352e389 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 9fb27c88c029..9fb27c88c029 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 9b04f2b6fcb4..9b04f2b6fcb4 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/pydbus/default.nix b/nixpkgs/pkgs/development/python-modules/pydbus/default.nix
index 27b2d237cfcd..27b2d237cfcd 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 9b650181e8ca..9b650181e8ca 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/pydispatcher/default.nix b/nixpkgs/pkgs/development/python-modules/pydispatcher/default.nix
index 68772cab3068..68772cab3068 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 48bc3c3fa005..48bc3c3fa005 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/default.nix b/nixpkgs/pkgs/development/python-modules/pydocstyle/default.nix
index a2f2daa2fe9c..a2f2daa2fe9c 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 4413f9eef2e7..4413f9eef2e7 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 021043d9e9db..021043d9e9db 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 e862f1e7c2c3..e862f1e7c2c3 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 ba754e9959bf..ba754e9959bf 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 03b594a131a0..03b594a131a0 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/pydub/default.nix b/nixpkgs/pkgs/development/python-modules/pydub/default.nix
index 669d798312b4..669d798312b4 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/pyechonest/default.nix b/nixpkgs/pkgs/development/python-modules/pyechonest/default.nix
index 33e8d9c3fa9d..33e8d9c3fa9d 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 1715749fa2da..1715749fa2da 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 28c74487c966..28c74487c966 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 8c240261463a..8c240261463a 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 4822e528deea..4822e528deea 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/pyev/default.nix b/nixpkgs/pkgs/development/python-modules/pyev/default.nix
index e393265ae37f..e393265ae37f 100644
--- a/pkgs/development/python-modules/pyev/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyev/default.nix
diff --git a/pkgs/development/python-modules/pyexcelerator/default.nix b/nixpkgs/pkgs/development/python-modules/pyexcelerator/default.nix
index 2dfb5831f7fe..2dfb5831f7fe 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 cca8b552de1e..cca8b552de1e 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 31a188ed1720..31a188ed1720 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/pyezminc/default.nix b/nixpkgs/pkgs/development/python-modules/pyezminc/default.nix
index 614a1555cbef..614a1555cbef 100644
--- a/pkgs/development/python-modules/pyezminc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyezminc/default.nix
diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix
index 7142b40ce0b0..7142b40ce0b0 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 1abf04079880..1abf04079880 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 bed1dffa5c72..bed1dffa5c72 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 d8256e9632a3..d8256e9632a3 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 036872e23e36..036872e23e36 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 d9aab0b8faed..d9aab0b8faed 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 a5caca40650d..a5caca40650d 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 8f80447b85d3..8f80447b85d3 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 2b20ba956009..2b20ba956009 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 9fc654292ab3..9fc654292ab3 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 44d6679e47c3..44d6679e47c3 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 93a74114af19..93a74114af19 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 a3d6f6e4c21a..a3d6f6e4c21a 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 b9c45ce8967d..b9c45ce8967d 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 ab46a5670eeb..ab46a5670eeb 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/pygccxml/default.nix b/nixpkgs/pkgs/development/python-modules/pygccxml/default.nix
index d4c46d6b8359..d4c46d6b8359 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 fc19ab26573a..fc19ab26573a 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 0b0e8f55fa7f..0b0e8f55fa7f 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 313a3e5ab189..313a3e5ab189 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 1b00e1264ffc..1b00e1264ffc 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 65688cf17bb5..65688cf17bb5 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 507310b4c51e..507310b4c51e 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 8372adc9bdb1..8372adc9bdb1 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 4826db3a8c02..4826db3a8c02 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 7fef05262f4d..7fef05262f4d 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/pygobject/pygobject-2.28.6-gio-types-2.32.patch b/nixpkgs/pkgs/development/python-modules/pygobject/pygobject-2.28.6-gio-types-2.32.patch
index fa0adf54ad04..fa0adf54ad04 100644
--- a/pkgs/development/python-modules/pygobject/pygobject-2.28.6-gio-types-2.32.patch
+++ b/nixpkgs/pkgs/development/python-modules/pygobject/pygobject-2.28.6-gio-types-2.32.patch
diff --git a/pkgs/development/python-modules/pygobject/pygobject-2.28.6-set_qdata.patch b/nixpkgs/pkgs/development/python-modules/pygobject/pygobject-2.28.6-set_qdata.patch
index 55376b59d829..55376b59d829 100644
--- a/pkgs/development/python-modules/pygobject/pygobject-2.28.6-set_qdata.patch
+++ b/nixpkgs/pkgs/development/python-modules/pygobject/pygobject-2.28.6-set_qdata.patch
diff --git a/pkgs/development/python-modules/pygpgme/default.nix b/nixpkgs/pkgs/development/python-modules/pygpgme/default.nix
index 4322e76e3e74..4322e76e3e74 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 706284b56dbc..706284b56dbc 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 e4ff925009d7..e4ff925009d7 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/pygtail/default.nix b/nixpkgs/pkgs/development/python-modules/pygtail/default.nix
index 503dad717c2b..503dad717c2b 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 c6f939d319ab..c6f939d319ab 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 783c5e2d4671..783c5e2d4671 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 a03be0ac04df..a03be0ac04df 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 18540aca50eb..18540aca50eb 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/pyhepmc/default.nix b/nixpkgs/pkgs/development/python-modules/pyhepmc/default.nix
index 0ff269c98740..0ff269c98740 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 5c6e56566a34..5c6e56566a34 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 85e26a1a1607..85e26a1a1607 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 ac4af42851cd..ac4af42851cd 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 c2fb9612e9c5..c2fb9612e9c5 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/pyicu/default.nix b/nixpkgs/pkgs/development/python-modules/pyicu/default.nix
index a9523826b110..a9523826b110 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 0e070d8a89d9..0e070d8a89d9 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 153b5701b267..153b5701b267 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 8f96ebe915a6..8f96ebe915a6 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 ad6742f5deb3..ad6742f5deb3 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 efbced9f3b32..efbced9f3b32 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/pyjwkest/default.nix b/nixpkgs/pkgs/development/python-modules/pyjwkest/default.nix
index 4460105f6174..4460105f6174 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 c02c0361cf28..c02c0361cf28 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/pykde4/default.nix b/nixpkgs/pkgs/development/python-modules/pykde4/default.nix
index 0770520ceee9..0770520ceee9 100644
--- a/pkgs/development/python-modules/pykde4/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pykde4/default.nix
diff --git a/pkgs/development/python-modules/pykde4/dlfcn.patch b/nixpkgs/pkgs/development/python-modules/pykde4/dlfcn.patch
index 63aff46eeab1..63aff46eeab1 100644
--- a/pkgs/development/python-modules/pykde4/dlfcn.patch
+++ b/nixpkgs/pkgs/development/python-modules/pykde4/dlfcn.patch
diff --git a/pkgs/development/python-modules/pykde4/kdelibs.nix b/nixpkgs/pkgs/development/python-modules/pykde4/kdelibs.nix
index c5e148d1500a..c5e148d1500a 100644
--- a/pkgs/development/python-modules/pykde4/kdelibs.nix
+++ b/nixpkgs/pkgs/development/python-modules/pykde4/kdelibs.nix
diff --git a/pkgs/development/python-modules/pykdtree/default.nix b/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix
index 2dd014821e6b..2dd014821e6b 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 bb1f60025db7..bb1f60025db7 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 07db7e7002bd..07db7e7002bd 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 bc06a10f9732..bc06a10f9732 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 4fe7816d4fdc..4fe7816d4fdc 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 3073f55ca3ae..3073f55ca3ae 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 6d58fbfb21a9..6d58fbfb21a9 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 895171ff7138..895171ff7138 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 97fbe28e50d7..97fbe28e50d7 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 6cea70c57089..6cea70c57089 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 ce0df266332e..ce0df266332e 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 3c637ffced30..3c637ffced30 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 9d21cacef9ad..9d21cacef9ad 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/1.9.nix b/nixpkgs/pkgs/development/python-modules/pylint/1.9.nix
index c088ea6a3967..c088ea6a3967 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 4faeb05280d0..4faeb05280d0 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 8ca565834d4a..8ca565834d4a 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 bd27de6eba77..bd27de6eba77 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 fa94441e2003..fa94441e2003 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 dfba421ae58d..dfba421ae58d 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 752755700b27..752755700b27 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 96023c01e1e5..96023c01e1e5 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 234aee8436dc..234aee8436dc 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 fb92739776da..fb92739776da 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 c38f56885d14..c38f56885d14 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 8403ec9add7d..8403ec9add7d 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/pymbolic/default.nix b/nixpkgs/pkgs/development/python-modules/pymbolic/default.nix
index 0d13b377b13e..0d13b377b13e 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 35e5f7aa69a2..35e5f7aa69a2 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 67318bac9bf8..67318bac9bf8 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/pyment/default.nix b/nixpkgs/pkgs/development/python-modules/pyment/default.nix
index bb27e5b3c3dd..bb27e5b3c3dd 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 2baf3181ac69..2baf3181ac69 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 792b8b1bd5b4..792b8b1bd5b4 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 a9350f20eb3f..a9350f20eb3f 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 38cc411f54df..38cc411f54df 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 c162f065b799..c162f065b799 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/pymvglive/default.nix b/nixpkgs/pkgs/development/python-modules/pymvglive/default.nix
index 3b7011fa7482..3b7011fa7482 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 4529a736f13b..4529a736f13b 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 0167fe00ea7c..0167fe00ea7c 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 5311d9817528..5311d9817528 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 0839cb1aa4a1..0839cb1aa4a1 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 fb2e9abe0651..fb2e9abe0651 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/pync/default.nix b/nixpkgs/pkgs/development/python-modules/pync/default.nix
index 24d285423f17..24d285423f17 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 5f877fd90d26..5f877fd90d26 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 f950c7798b88..f950c7798b88 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/pynvim/default.nix b/nixpkgs/pkgs/development/python-modules/pynvim/default.nix
index e5e14f44e109..e5e14f44e109 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 4225d30c6fe4..4225d30c6fe4 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 8c7af06b7434..8c7af06b7434 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 47a73c9c80af..47a73c9c80af 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 9350d4050dad..9350d4050dad 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 d78a5f55aadc..d78a5f55aadc 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 88fdc960a2bb..88fdc960a2bb 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 c7f1933878b4..c7f1933878b4 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 958711754bd0..958711754bd0 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 e17ec16f436d..e17ec16f436d 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 11a51f354d9f..11a51f354d9f 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 713861deae37..713861deae37 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 05ba24eac396..05ba24eac396 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 1392956ef036..1392956ef036 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 3af86dabe215..3af86dabe215 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 1c00d726eadc..1c00d726eadc 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 a6e8d6201384..a6e8d6201384 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 1a477ab23284..1a477ab23284 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 dc916213fcd0..dc916213fcd0 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 5842e1c510af..5842e1c510af 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 1c3b908396ec..1c3b908396ec 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 de2ddc98a8ed..de2ddc98a8ed 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 9709aea1d185..9709aea1d185 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/pyphen/default.nix b/nixpkgs/pkgs/development/python-modules/pyphen/default.nix
index 7a182b6be4a9..7a182b6be4a9 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 76503122a1b1..76503122a1b1 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 a17c650e0f0e..a17c650e0f0e 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 ccda4f2631d2..ccda4f2631d2 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 b9e02242e003..b9e02242e003 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 1104097cd3e7..1104097cd3e7 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 de1b17be739d..de1b17be739d 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/pyproj/default.nix b/nixpkgs/pkgs/development/python-modules/pyproj/default.nix
index f08625f62b6d..f08625f62b6d 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 6349b56b4749..6349b56b4749 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 4313f700ae17..4313f700ae17 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 9f7c75a02d30..9f7c75a02d30 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 288f35f23524..288f35f23524 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 faa36fa1913d..faa36fa1913d 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 a2c4a9491b6d..a2c4a9491b6d 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/pyquery/default.nix b/nixpkgs/pkgs/development/python-modules/pyquery/default.nix
index 70f144b62581..70f144b62581 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/pyramid/default.nix b/nixpkgs/pkgs/development/python-modules/pyramid/default.nix
index 3c76da67b7bd..3c76da67b7bd 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 19b26a30ad71..19b26a30ad71 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 398869e467b7..398869e467b7 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 635ed3510fc7..635ed3510fc7 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 152b12a935a2..152b12a935a2 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 a27232550571..a27232550571 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 216fb57c2210..216fb57c2210 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 b4064e9f0f7e..b4064e9f0f7e 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 7c01e3e093bd..7c01e3e093bd 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 60bdbf011674..60bdbf011674 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 dda3a3cd161a..dda3a3cd161a 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 d75119b6e328..d75119b6e328 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 99c4b7116d5a..99c4b7116d5a 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 ba72bf4be94b..ba72bf4be94b 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 f70f10da41ad..f70f10da41ad 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 65ff765a5849..65ff765a5849 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 d99a703b173c..d99a703b173c 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 3380cf1205c3..3380cf1205c3 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 a2b614ba3b8c..a2b614ba3b8c 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 1c65d7ca5c71..1c65d7ca5c71 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 0bb240310847..0bb240310847 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 05f2db8ac063..05f2db8ac063 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 9512fce4f452..9512fce4f452 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 d984c55a8a7f..d984c55a8a7f 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 280981ab2c24..280981ab2c24 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 b1a2b4e2350a..b1a2b4e2350a 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 be667503d47c..be667503d47c 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 bab8e502b9c8..bab8e502b9c8 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/pyschedule/default.nix b/nixpkgs/pkgs/development/python-modules/pyschedule/default.nix
index 5fbabdc09883..5fbabdc09883 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/pyscss/default.nix b/nixpkgs/pkgs/development/python-modules/pyscss/default.nix
index 625eae7b74b9..625eae7b74b9 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 ca723a0e5739..ca723a0e5739 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 1ffc546cfa1e..1ffc546cfa1e 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 b49ec5030f9a..b49ec5030f9a 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 5069bbe96484..5069bbe96484 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/default.nix b/nixpkgs/pkgs/development/python-modules/pyserial/default.nix
index 98ffbe5ad9ec..98ffbe5ad9ec 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 0ed5790a5197..0ed5790a5197 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 d459be25a86e..d459be25a86e 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 17d60f7507d3..17d60f7507d3 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 d9168f291c02..d9168f291c02 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 37ffd8e76e30..37ffd8e76e30 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 440e94508c57..440e94508c57 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 0950726172d5..0950726172d5 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 42ad55ad0b95..42ad55ad0b95 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 fb095cf991cf..fb095cf991cf 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 6c2b357c5668..6c2b357c5668 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 5314a5cc7135..5314a5cc7135 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 afa48569e2ac..afa48569e2ac 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 681e16a2bfd3..681e16a2bfd3 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 85bcf56f0628..85bcf56f0628 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 d8609ca07766..d8609ca07766 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/pysmbc/default.nix b/nixpkgs/pkgs/development/python-modules/pysmbc/default.nix
index b6068a65fbd3..b6068a65fbd3 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 ef5e560b08c7..ef5e560b08c7 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 62c631ac98cc..62c631ac98cc 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 f4d6ceea8dd0..f4d6ceea8dd0 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/pysocks/default.nix b/nixpkgs/pkgs/development/python-modules/pysocks/default.nix
index 0f4b2b688cd9..0f4b2b688cd9 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 0544b84e532f..0544b84e532f 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 ced2906486a1..ced2906486a1 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 45c84d167539..45c84d167539 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/pyspf/default.nix b/nixpkgs/pkgs/development/python-modules/pyspf/default.nix
index c4ebaf160fa6..c4ebaf160fa6 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 990e2b28bd89..990e2b28bd89 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 39671041d8a6..39671041d8a6 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 d80cbf41629d..d80cbf41629d 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 46864632964a..46864632964a 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 c1118aeeecd7..c1118aeeecd7 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 8fb734550516..8fb734550516 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 514ff6eb8fe1..514ff6eb8fe1 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 38dddda9b2e5..38dddda9b2e5 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 ee57c4995481..ee57c4995481 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 47d6ea7e26b8..47d6ea7e26b8 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 e569042f729a..e569042f729a 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 2dcb7908522a..2dcb7908522a 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 a1c70b4c2052..a1c70b4c2052 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 46d4135d6afb..46d4135d6afb 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 675bd47481eb..675bd47481eb 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 547e52edbd20..547e52edbd20 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 f7eb9fb1d42a..f7eb9fb1d42a 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 7f707ebc46b6..7f707ebc46b6 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 581de7beeebc..581de7beeebc 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 3085ee06e870..3085ee06e870 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-asyncio/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-asyncio/default.nix
index 346530d4a819..346530d4a819 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-benchmark/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-benchmark/default.nix
index b43c00e42d9f..b43c00e42d9f 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-catchlog/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-catchlog/default.nix
index fb020ba471fc..fb020ba471fc 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-click/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix
index e20ebc77ad1d..e20ebc77ad1d 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 9ddec4199d7f..9ddec4199d7f 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 9639bd7f7787..9639bd7f7787 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 1c323929a8e0..1c323929a8e0 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 2f82f4d7dbd4..2f82f4d7dbd4 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 794a1e8bf20f..794a1e8bf20f 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-env/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-env/default.nix
index 909a193bd7b1..909a193bd7b1 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 557446b5adcc..557446b5adcc 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 9fddb743964c..9fddb743964c 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 7fc3d4e951fb..7fc3d4e951fb 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 d3b2df60399d..d3b2df60399d 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 df7981e6bfc0..df7981e6bfc0 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-forked/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-forked/default.nix
index b3ea60174a65..b3ea60174a65 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-httpbin/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-httpbin/default.nix
index 6d84ef0de7db..6d84ef0de7db 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 235d6f3af245..235d6f3af245 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 5f2516b646c5..5f2516b646c5 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 8fba5e90ab11..8fba5e90ab11 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-mypy/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix
index 09d79b337919..09d79b337919 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-pep257/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-pep257/default.nix
index 0ff8890a6fbd..0ff8890a6fbd 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 1fcb99574b2a..1fcb99574b2a 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 8943f220fe62..8943f220fe62 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-quickcheck/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-quickcheck/default.nix
index 1e8a49f90be7..1e8a49f90be7 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 bc7d14132003..bc7d14132003 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-relaxed/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-relaxed/default.nix
index bd92577d5bac..bd92577d5bac 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-repeat/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-repeat/default.nix
index 0669c22f9211..0669c22f9211 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 79ce9fa63a9b..79ce9fa63a9b 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 c760b6a5542a..c760b6a5542a 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 90b60686ee6c..90b60686ee6c 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 2a4c5591a5f5..2a4c5591a5f5 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 6bc7047866ee..6bc7047866ee 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-subtesthack/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-subtesthack/default.nix
index b639b61ad4d3..b639b61ad4d3 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 5ece578dc258..5ece578dc258 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 1a4cc260ff44..1a4cc260ff44 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 3997e716817f..3997e716817f 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 a5c351502683..a5c351502683 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 0e8add5417be..0e8add5417be 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 78cd02897f9a..78cd02897f9a 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 12b06c2e1b63..12b06c2e1b63 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 b61bc8d5fa50..b61bc8d5fa50 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/3.10.nix b/nixpkgs/pkgs/development/python-modules/pytest/3.10.nix
index f24cab8af1c6..f24cab8af1c6 100644
--- a/pkgs/development/python-modules/pytest/3.10.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest/3.10.nix
diff --git a/pkgs/development/python-modules/pytest/default.nix b/nixpkgs/pkgs/development/python-modules/pytest/default.nix
index c74d59fd9925..c74d59fd9925 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 2875bf88340f..2875bf88340f 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 78ad4d2abc8c..78ad4d2abc8c 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 e372913af7df..e372913af7df 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 55a0a355a9e6..55a0a355a9e6 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 9ed165f93b11..9ed165f93b11 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 c37abf7b55f4..c37abf7b55f4 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 93c051064049..93c051064049 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 bee0cab0a3f5..bee0cab0a3f5 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 f86cdc665a1d..f86cdc665a1d 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-dotenv/default.nix b/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix
index ba74817a63fd..ba74817a63fd 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 4691785dae16..4691785dae16 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 47e269c2ff50..47e269c2ff50 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 93dd9fb654f9..93dd9fb654f9 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 1369479ac4f4..1369479ac4f4 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 dbfde18a8741..dbfde18a8741 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 68f9ad16977b..68f9ad16977b 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 167da239fd16..167da239fd16 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 728a353cec7f..728a353cec7f 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 c2fcb5440ad6..c2fcb5440ad6 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 0f20a01e0b22..0f20a01e0b22 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 9cd55757aac7..9cd55757aac7 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 4eb2daaf26dc..4eb2daaf26dc 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 0141141b43c4..0141141b43c4 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 29c6950070a5..29c6950070a5 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 54c5418ae677..54c5418ae677 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 3ba81cacfd41..3ba81cacfd41 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 7a16621da0a5..7a16621da0a5 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 bae94191fc03..bae94191fc03 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-ly/default.nix b/nixpkgs/pkgs/development/python-modules/python-ly/default.nix
index 4c1bd05f4a0f..4c1bd05f4a0f 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 544d8f6254d6..544d8f6254d6 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-magic/default.nix b/nixpkgs/pkgs/development/python-modules/python-magic/default.nix
index d48a6288a7dd..d48a6288a7dd 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 35b7a706f609..35b7a706f609 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 053b4897e833..053b4897e833 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-mnist/default.nix b/nixpkgs/pkgs/development/python-modules/python-mnist/default.nix
index 67cb4eae2511..67cb4eae2511 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-oauth2/default.nix b/nixpkgs/pkgs/development/python-modules/python-oauth2/default.nix
index e8c71bff18b2..e8c71bff18b2 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-otr/default.nix b/nixpkgs/pkgs/development/python-modules/python-otr/default.nix
index 2b08bbffa450..2b08bbffa450 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 ff3d28b47466..ff3d28b47466 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 b2b103858cce..b2b103858cce 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-prctl/default.nix b/nixpkgs/pkgs/development/python-modules/python-prctl/default.nix
index 5d092f5e6eab..5d092f5e6eab 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 19d70f234a99..19d70f234a99 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 ad0a17da2ac8..ad0a17da2ac8 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 07cbffad1f89..07cbffad1f89 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 65c5e08d934c..65c5e08d934c 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 24a21959b8c9..24a21959b8c9 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 699d370af757..699d370af757 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 328b1ec0994d..328b1ec0994d 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 5dff7189e66c..5dff7189e66c 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 451138fa38d8..451138fa38d8 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 06577249a02d..06577249a02d 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 5af4383d44b3..5af4383d44b3 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-u2flib-host/default.nix b/nixpkgs/pkgs/development/python-modules/python-u2flib-host/default.nix
index 38785d813138..38785d813138 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 ba5a527fdb08..ba5a527fdb08 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-utils/default.nix b/nixpkgs/pkgs/development/python-modules/python-utils/default.nix
index 67fbd4e24ebe..67fbd4e24ebe 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 88982f15293b..88982f15293b 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-wifi/default.nix b/nixpkgs/pkgs/development/python-modules/python-wifi/default.nix
index 7e4f2ebccf05..7e4f2ebccf05 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/python2-pythondialog/default.nix b/nixpkgs/pkgs/development/python-modules/python2-pythondialog/default.nix
index 144887c75b31..144887c75b31 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 d0b10c42d019..d0b10c42d019 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/python3pika/default.nix b/nixpkgs/pkgs/development/python-modules/python3pika/default.nix
index 4f75acff02ec..4f75acff02ec 100644
--- a/pkgs/development/python-modules/python3pika/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python3pika/default.nix
diff --git a/pkgs/development/python-modules/python_fedora/default.nix b/nixpkgs/pkgs/development/python-modules/python_fedora/default.nix
index 1ff1f6512645..1ff1f6512645 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 da4f3ed529ec..da4f3ed529ec 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 90da2f256d44..90da2f256d44 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/default.nix b/nixpkgs/pkgs/development/python-modules/python_openzwave/default.nix
index ae3f0ba933a7..ae3f0ba933a7 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 d6b262d9aa35..d6b262d9aa35 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/pythonirclib/default.nix b/nixpkgs/pkgs/development/python-modules/pythonirclib/default.nix
index 35873d301be4..35873d301be4 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 6ed150d12398..6ed150d12398 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 98f714c8d538..98f714c8d538 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 b3a9cfe82ee4..b3a9cfe82ee4 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 4ece6fb41343..4ece6fb41343 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 ac48fe1c240f..ac48fe1c240f 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/pytoml/default.nix b/nixpkgs/pkgs/development/python-modules/pytoml/default.nix
index d65de8123235..d65de8123235 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 2de5b21d86f3..2de5b21d86f3 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 f14200b3542b..f14200b3542b 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/pytricia/default.nix b/nixpkgs/pkgs/development/python-modules/pytricia/default.nix
index 2f95d7fcecb2..2f95d7fcecb2 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 32e3b683e410..32e3b683e410 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 534bb1618bc4..534bb1618bc4 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 6fa4eb6387d0..6fa4eb6387d0 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 16aa7b0ec31b..16aa7b0ec31b 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 c35c35d6c57e..c35c35d6c57e 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 49b015507725..49b015507725 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 d9ff4369c7a7..d9ff4369c7a7 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 c54711bb6c84..c54711bb6c84 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 ce0c514e3eca..ce0c514e3eca 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 0e19b971a16c..0e19b971a16c 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 cd76b283028f..cd76b283028f 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 41e169acd5f5..41e169acd5f5 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 b3d4483d65dc..b3d4483d65dc 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/pyviz-comms/default.nix b/nixpkgs/pkgs/development/python-modules/pyviz-comms/default.nix
index 422e28960822..422e28960822 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/pyvoro/default.nix b/nixpkgs/pkgs/development/python-modules/pyvoro/default.nix
index 83bdcec86bd2..83bdcec86bd2 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 999bc1abeaf1..999bc1abeaf1 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 3fd618918781..3fd618918781 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 985e601d6257..985e601d6257 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 40aaea9c01a7..40aaea9c01a7 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 bbd02d8daafa..bbd02d8daafa 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 83403b3d1500..83403b3d1500 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 15cb474f5fe9..15cb474f5fe9 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/pywebkitgtk/default.nix b/nixpkgs/pkgs/development/python-modules/pywebkitgtk/default.nix
index 5448f5c6951d..5448f5c6951d 100644
--- a/pkgs/development/python-modules/pywebkitgtk/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pywebkitgtk/default.nix
diff --git a/pkgs/development/python-modules/pywebpush/default.nix b/nixpkgs/pkgs/development/python-modules/pywebpush/default.nix
index c9077c7a17c4..c9077c7a17c4 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 3bdc5efaaa53..3bdc5efaaa53 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 a377845563aa..a377845563aa 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 f667e09892c1..f667e09892c1 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 2f2b6e9b5431..2f2b6e9b5431 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 159645c425eb..159645c425eb 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 5a55c1f47bb2..5a55c1f47bb2 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 84dfb549fe1c..84dfb549fe1c 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 dcab96d12a6a..dcab96d12a6a 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 20666010f9aa..20666010f9aa 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 8a49e8418fd0..8a49e8418fd0 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 425bb21a687b..425bb21a687b 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/qiskit/default.nix b/nixpkgs/pkgs/development/python-modules/qiskit/default.nix
index bb92fc9df9ac..bb92fc9df9ac 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 713e9db566e4..713e9db566e4 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 4321c025b56d..4321c025b56d 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 987c1ca90490..987c1ca90490 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 91c2009744f7..91c2009744f7 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 ad1a7fd2ca36..ad1a7fd2ca36 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 7b1b8b0444c7..7b1b8b0444c7 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 6e3c25ef0dde..6e3c25ef0dde 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 19cfcff4ab18..19cfcff4ab18 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 b39e081c4712..b39e081c4712 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 fc4c192968f2..fc4c192968f2 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 bc778984493c..bc778984493c 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 dbcdd4c5924e..dbcdd4c5924e 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 13c24312ed0f..13c24312ed0f 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 f51aed9462a0..f51aed9462a0 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 7406faca6014..7406faca6014 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 4d80a4075646..4d80a4075646 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 8b2fdc90f049..8b2fdc90f049 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 ca6e4614f33d..ca6e4614f33d 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 215152ae4fb1..215152ae4fb1 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 0f870a5ab7a1..0f870a5ab7a1 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 ecc049b34f46..ecc049b34f46 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 83edfa4f1d27..83edfa4f1d27 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 9762fd280e06..9762fd280e06 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 375b6639368e..375b6639368e 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 9ea04fa8bdf7..9ea04fa8bdf7 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 6bee2bf1b0a3..6bee2bf1b0a3 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 e394b9646430..e394b9646430 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 53a8e046b55b..53a8e046b55b 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 badaf9b3787b..badaf9b3787b 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 1ed4539dca08..1ed4539dca08 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 90522c34196a..90522c34196a 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 df943cfcca41..df943cfcca41 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 baf26c2437bc..baf26c2437bc 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 d5305781ef5c..d5305781ef5c 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 09090540a5b0..09090540a5b0 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 f6965fd6cd93..f6965fd6cd93 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 aaa095c53980..aaa095c53980 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 057e779803cb..057e779803cb 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 1851fe7a0de9..1851fe7a0de9 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 fa142cf87236..fa142cf87236 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 bc16fffcef53..bc16fffcef53 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/reikna/default.nix b/nixpkgs/pkgs/development/python-modules/reikna/default.nix
index 6a7cbdcc5aff..6a7cbdcc5aff 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 e9f4b8e2bd6c..e9f4b8e2bd6c 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 a4d1dcc485ec..a4d1dcc485ec 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 37203128486e..37203128486e 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 ac041d664ae4..ac041d664ae4 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 c5c2e43b6573..c5c2e43b6573 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 88437ae90327..88437ae90327 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 eba47a3b2d19..eba47a3b2d19 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 ef2a7fb246a9..ef2a7fb246a9 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 9e144340fb35..9e144340fb35 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 20001ff7ef88..20001ff7ef88 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 f84508fe53cd..f84508fe53cd 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 46d1dbdbbd62..46d1dbdbbd62 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 c8886b75d644..c8886b75d644 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 fac222176519..fac222176519 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-kerberos/default.nix b/nixpkgs/pkgs/development/python-modules/requests-kerberos/default.nix
index ab0758a84e16..ab0758a84e16 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 67cc3a60f77e..67cc3a60f77e 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 3ea1bf58d8af..3ea1bf58d8af 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 be37a48f00cb..be37a48f00cb 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 8dba9a91226e..8dba9a91226e 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 4eb3a33926ff..4eb3a33926ff 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 063c6d950711..063c6d950711 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 8062834e1803..8062834e1803 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 12cbae543ce2..12cbae543ce2 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 55b320955351..55b320955351 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/resampy/default.nix b/nixpkgs/pkgs/development/python-modules/resampy/default.nix
index e9e51756d9fb..e9e51756d9fb 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 d154499c03bf..d154499c03bf 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/restructuredtext_lint/default.nix b/nixpkgs/pkgs/development/python-modules/restructuredtext_lint/default.nix
index 340c558b7a42..340c558b7a42 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 a6b22220da35..a6b22220da35 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 f6d816d37c0e..f6d816d37c0e 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 a4743dcbfe46..a4743dcbfe46 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 496705acbc40..496705acbc40 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 9074634e9b6a..9074634e9b6a 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 a1626d6b65c3..a1626d6b65c3 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 eda1be2c1109..eda1be2c1109 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 6488dfdd8ce5..6488dfdd8ce5 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/rfc7464/default.nix b/nixpkgs/pkgs/development/python-modules/rfc7464/default.nix
index 60a5308d718a..60a5308d718a 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 dc93effe802f..dc93effe802f 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 1a40f61cc50e..1a40f61cc50e 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 d83afd7885f0..d83afd7885f0 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/rjsmin/default.nix b/nixpkgs/pkgs/development/python-modules/rjsmin/default.nix
index 287ae0391df3..287ae0391df3 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 10bc1a70924a..10bc1a70924a 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 c8c4315b66bb..c8c4315b66bb 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 58a767432a22..58a767432a22 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 a86e17e921b6..a86e17e921b6 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/robotframework-requests/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix
index 7233a82a395b..7233a82a395b 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 8bac32ba9112..8bac32ba9112 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 67f04f4f9919..67f04f4f9919 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 7294126f5162..7294126f5162 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 d0e5b13ddbe8..d0e5b13ddbe8 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 be8b0b9454d7..be8b0b9454d7 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 6d19feed3fb7..6d19feed3fb7 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 1a2ef201c50d..1a2ef201c50d 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 59ef766adf11..59ef766adf11 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 616927531a56..616927531a56 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 52d45d728752..52d45d728752 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/root_numpy/default.nix b/nixpkgs/pkgs/development/python-modules/root_numpy/default.nix
index dc2c5f790b59..dc2c5f790b59 100644
--- a/pkgs/development/python-modules/root_numpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/root_numpy/default.nix
diff --git a/pkgs/development/python-modules/rootpy/default.nix b/nixpkgs/pkgs/development/python-modules/rootpy/default.nix
index 8384510468a4..8384510468a4 100644
--- a/pkgs/development/python-modules/rootpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rootpy/default.nix
diff --git a/pkgs/development/python-modules/rope/default.nix b/nixpkgs/pkgs/development/python-modules/rope/default.nix
index 66340f917704..66340f917704 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 7b07bf3ff059..7b07bf3ff059 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 1e2e67c6206d..1e2e67c6206d 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 8b22ef967d5c..8b22ef967d5c 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 3164be5aa86d..3164be5aa86d 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 a468bee275c9..a468bee275c9 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 76fc508a5d82..76fc508a5d82 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/default.nix b/nixpkgs/pkgs/development/python-modules/rpy2/default.nix
index 1b4ab4d40db9..1b4ab4d40db9 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 a55b6038bb4b..a55b6038bb4b 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/rpyc/default.nix b/nixpkgs/pkgs/development/python-modules/rpyc/default.nix
index b69bf1851a8b..b69bf1851a8b 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/rsa/default.nix b/nixpkgs/pkgs/development/python-modules/rsa/default.nix
index 1b3d339b0785..1b3d339b0785 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 5453541e2de5..5453541e2de5 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 ba6a79fdd634..ba6a79fdd634 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 7dec5bb54cae..7dec5bb54cae 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 a4ac86302cf8..a4ac86302cf8 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/rubymarshal/default.nix b/nixpkgs/pkgs/development/python-modules/rubymarshal/default.nix
index ac7ba00c5867..ac7ba00c5867 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/runsnakerun/default.nix b/nixpkgs/pkgs/development/python-modules/runsnakerun/default.nix
index eba8871fd022..eba8871fd022 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/rx/default.nix b/nixpkgs/pkgs/development/python-modules/rx/default.nix
index 6183596ef7dd..6183596ef7dd 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/s2clientprotocol/default.nix b/nixpkgs/pkgs/development/python-modules/s2clientprotocol/default.nix
index 5fbf4b6fab2c..5fbf4b6fab2c 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 43675c3bb11c..43675c3bb11c 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 0a974133252e..0a974133252e 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 7589d0fce73c..7589d0fce73c 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 e8294ce7bcdc..e8294ce7bcdc 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/safe/default.nix b/nixpkgs/pkgs/development/python-modules/safe/default.nix
index f7f6f7eabf91..f7f6f7eabf91 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 afd915ed8407..afd915ed8407 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 fcc27e3c4dbe..fcc27e3c4dbe 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 b5952e6ee156..b5952e6ee156 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 1a3511dab977..1a3511dab977 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 6aae4c11fdd4..6aae4c11fdd4 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 4d7a3a5972f7..4d7a3a5972f7 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 bf0b1e015637..bf0b1e015637 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 4fb169b15584..4fb169b15584 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 2736eb2ee9a3..2736eb2ee9a3 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 7ca3fc0f94be..7ca3fc0f94be 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 7ecb16c3b7c7..7ecb16c3b7c7 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 4d4ec409e028..4d4ec409e028 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 d68f38aa4bb5..d68f38aa4bb5 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 c5e36f8ac070..c5e36f8ac070 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 91fa26ef44d2..91fa26ef44d2 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-build/fix_pytestrunner_req.patch b/nixpkgs/pkgs/development/python-modules/scikit-build/fix_pytestrunner_req.patch
index e8e19f84a5d4..e8e19f84a5d4 100644
--- a/pkgs/development/python-modules/scikit-build/fix_pytestrunner_req.patch
+++ b/nixpkgs/pkgs/development/python-modules/scikit-build/fix_pytestrunner_req.patch
diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-image/default.nix
index e2ba35e0438c..e2ba35e0438c 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/scikitlearn/0.20.nix b/nixpkgs/pkgs/development/python-modules/scikitlearn/0.20.nix
index b1c074faa8f6..b1c074faa8f6 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 7eb020bbe609..7eb020bbe609 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/scipy/default.nix b/nixpkgs/pkgs/development/python-modules/scipy/default.nix
index a69ab0d27a3c..a69ab0d27a3c 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 7c198519331b..7c198519331b 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 c57d10cf8908..c57d10cf8908 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 ecfbc98530ed..ecfbc98530ed 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 53038cf74e5f..53038cf74e5f 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 2ae7a4c8e361..2ae7a4c8e361 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 478453821782..478453821782 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 d596c640823c..d596c640823c 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 8555c024c76a..8555c024c76a 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 6b9f00783fd2..6b9f00783fd2 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 8fa044e638a4..8fa044e638a4 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 e2c3e975b9a3..e2c3e975b9a3 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/seekpath/default.nix b/nixpkgs/pkgs/development/python-modules/seekpath/default.nix
index 7578b0479405..7578b0479405 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 030178fef830..030178fef830 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 079e88378c07..079e88378c07 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 ada159aaa121..ada159aaa121 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 e3c92a0e40fc..e3c92a0e40fc 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 b5855fbb143d..b5855fbb143d 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 4072268609d2..4072268609d2 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 35115a45716e..35115a45716e 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/sentinel/default.nix b/nixpkgs/pkgs/development/python-modules/sentinel/default.nix
index e8ed047e03ff..e8ed047e03ff 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 503b899ec22d..503b899ec22d 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 deb24a7130a7..deb24a7130a7 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 158d9a054df9..158d9a054df9 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 5ea59eb6a2a3..5ea59eb6a2a3 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 b627322307dc..b627322307dc 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 c6795f172064..c6795f172064 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 2f7acce976de..2f7acce976de 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 f39dd48232be..f39dd48232be 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 e45638edd101..e45638edd101 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 862a7bc27786..862a7bc27786 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/default.nix b/nixpkgs/pkgs/development/python-modules/setuptools/default.nix
index a849dad54aa9..a849dad54aa9 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 a222fc9e49f8..a222fc9e49f8 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 d696a5be08fa..d696a5be08fa 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 b393d0eb2003..b393d0eb2003 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 1e282f9660a8..1e282f9660a8 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 aa18f07e49e5..aa18f07e49e5 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 6488dd1ffeaa..6488dd1ffeaa 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/shapely/default.nix b/nixpkgs/pkgs/development/python-modules/shapely/default.nix
index 220726733dcb..220726733dcb 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 f75ad7a9486e..f75ad7a9486e 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 d3222ac7d140..d3222ac7d140 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 707a79e10551..707a79e10551 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 82dfa3c4ea2a..82dfa3c4ea2a 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 0884c020e832..0884c020e832 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 7682d2086034..7682d2086034 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 cefe7dac2210..cefe7dac2210 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 ac2fef9f2dfa..ac2fef9f2dfa 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 987d7e60cea6..987d7e60cea6 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 ccff9ff4b9f8..ccff9ff4b9f8 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/sievelib/default.nix b/nixpkgs/pkgs/development/python-modules/sievelib/default.nix
index d579f3ef7445..d579f3ef7445 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 33a615fefd46..33a615fefd46 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 92a39e26da0e..92a39e26da0e 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 ad1f2643e5f0..ad1f2643e5f0 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-websocket-server/default.nix b/nixpkgs/pkgs/development/python-modules/simple-websocket-server/default.nix
index ee9444fd38ec..ee9444fd38ec 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 230ac17fa0aa..230ac17fa0aa 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 705b75593725..705b75593725 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 ca304fc10f67..ca304fc10f67 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/simplegeneric/default.nix b/nixpkgs/pkgs/development/python-modules/simplegeneric/default.nix
index 491e218154c0..491e218154c0 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 9e80830f4380..9e80830f4380 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 d97c1b0c9638..d97c1b0c9638 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 339f6d1debd7..339f6d1debd7 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 981b6693f7d4..981b6693f7d4 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 e0b207735dfa..e0b207735dfa 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 2b034897a784..2b034897a784 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 bf76166d73b4..bf76166d73b4 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 78e7a5f05389..78e7a5f05389 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 190692c43627..190692c43627 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 71163a2f11f6..71163a2f11f6 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 426019fc8a97..426019fc8a97 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 d8d6eb106838..d8d6eb106838 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/slicerator/default.nix b/nixpkgs/pkgs/development/python-modules/slicerator/default.nix
index af17780909e6..af17780909e6 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 e82cbe5b705e..e82cbe5b705e 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 10241104ef33..10241104ef33 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 53d2006315c1..53d2006315c1 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 4bb3b7c73490..4bb3b7c73490 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 490113d6952a..490113d6952a 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 f9175e507b46..f9175e507b46 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 011fa1799abd..011fa1799abd 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 325f59b1df22..325f59b1df22 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 50667ce93987..50667ce93987 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 71ff2037de89..71ff2037de89 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 366897d3e198..366897d3e198 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 cf0b76d1a87b..cf0b76d1a87b 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 ac625cf1fa04..ac625cf1fa04 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 5eb8d77a244d..5eb8d77a244d 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/snakeviz/default.nix b/nixpkgs/pkgs/development/python-modules/snakeviz/default.nix
index c55d6c7376a5..c55d6c7376a5 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 1e008d96497b..1e008d96497b 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 db1a75ab7f27..db1a75ab7f27 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 f5674c09e021..f5674c09e021 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/snowballstemmer/default.nix b/nixpkgs/pkgs/development/python-modules/snowballstemmer/default.nix
index 9b7481a62a64..9b7481a62a64 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/snscrape/default.nix b/nixpkgs/pkgs/development/python-modules/snscrape/default.nix
index 40b2626bade0..40b2626bade0 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 0b3adbe15d90..0b3adbe15d90 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 017ea7e0d5fd..017ea7e0d5fd 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 10722e8af06d..10722e8af06d 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 37961f898f59..37961f898f59 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 3f0d16cc8a86..3f0d16cc8a86 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/sopel/default.nix b/nixpkgs/pkgs/development/python-modules/sopel/default.nix
index d01fd722ab83..d01fd722ab83 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 098e2292efd5..098e2292efd5 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 b8261d88628c..b8261d88628c 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 b2b7f2035030..b2b7f2035030 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 2094aa7793d6..2094aa7793d6 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 a5761764fdbb..a5761764fdbb 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 4ba18618674f..4ba18618674f 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 9f877ffb3554..9f877ffb3554 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 178be8bd86ac..178be8bd86ac 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 d8078c116c2f..d8078c116c2f 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 d9a67454fe6a..d9a67454fe6a 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 2d2f066eaedc..2d2f066eaedc 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 bbd7cbb210e0..bbd7cbb210e0 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 badc99f5e377..badc99f5e377 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 0a51bb5f9e84..0a51bb5f9e84 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 168c491f7ef8..168c491f7ef8 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 5de86d9e14c2..5de86d9e14c2 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 661bc6363f4f..661bc6363f4f 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 36816f6133d6..36816f6133d6 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 73af5d7b00c6..73af5d7b00c6 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 3309f1e9978f..3309f1e9978f 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 f5de476d1096..f5de476d1096 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 375f59ec3f91..375f59ec3f91 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 02e5711e888f..02e5711e888f 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 8f9539705556..8f9539705556 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/default.nix b/nixpkgs/pkgs/development/python-modules/sphinx/default.nix
index 4bea277a95b3..4bea277a95b3 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_pypi_upload/default.nix b/nixpkgs/pkgs/development/python-modules/sphinx_pypi_upload/default.nix
index 52590817c71b..52590817c71b 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 515f6b6156aa..515f6b6156aa 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-bibtex/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
index 2daa9766a3af..2daa9766a3af 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 1eeb40ddbc22..1eeb40ddbc22 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-openapi/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix
index b8a4f25f5df0..b8a4f25f5df0 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-spelling/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix
index f528edb75ab3..f528edb75ab3 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-websupport/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix
index d4f17171e3b8..d4f17171e3b8 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 5173c54be34f..5173c54be34f 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 2dfaf7dbc143..2dfaf7dbc143 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 7e1d08eb21b9..7e1d08eb21b9 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 5d863192b2b6..5d863192b2b6 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 9a414e31360b..9a414e31360b 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 a3aaa942a9be..a3aaa942a9be 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 406cd6e8627f..406cd6e8627f 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-imageattach/default.nix b/nixpkgs/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix
index 96de95655e05..96de95655e05 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 ba93fb040b9a..ba93fb040b9a 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/default.nix b/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix
index c7ff2e56f02b..c7ff2e56f02b 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 bc49c0e426ba..bc49c0e426ba 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 40eefc1db56b..40eefc1db56b 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 187f06c6ad9f..187f06c6ad9f 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 5858779b86ba..5858779b86ba 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 3a0e95ab77e3..3a0e95ab77e3 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 e7e9a1e5391b..e7e9a1e5391b 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 d1685b4d579a..d1685b4d579a 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 f41452b4b61d..f41452b4b61d 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 82f1315ba3d2..82f1315ba3d2 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 8157b893d742..8157b893d742 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/sslib/default.nix b/nixpkgs/pkgs/development/python-modules/sslib/default.nix
index 3e5be211d42b..3e5be211d42b 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/staticjinja/default.nix b/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix
index 32aecdc91915..32aecdc91915 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 4380e592ff56..4380e592ff56 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 36042a72ea88..36042a72ea88 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 250191559055..250191559055 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 69931a46007f..69931a46007f 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 e7f8be7b4694..e7f8be7b4694 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/stompclient/default.nix b/nixpkgs/pkgs/development/python-modules/stompclient/default.nix
index 1efcd6a65005..1efcd6a65005 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 2b03ddcf9c94..2b03ddcf9c94 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 e8e4eb4bf35b..e8e4eb4bf35b 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 5360b951de26..5360b951de26 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 7f45f326903a..7f45f326903a 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 50c1cc50a2c1..50c1cc50a2c1 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/stringtemplate/default.nix b/nixpkgs/pkgs/development/python-modules/stringtemplate/default.nix
index 3d2b2337be4c..3d2b2337be4c 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 9c252aa9ce25..9c252aa9ce25 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 f7e390bd6788..f7e390bd6788 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/subdownloader/default.nix b/nixpkgs/pkgs/development/python-modules/subdownloader/default.nix
index 24b082123b82..24b082123b82 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 61d406edafc7..61d406edafc7 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 0f43a73546df..0f43a73546df 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 024fd136c403..024fd136c403 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 efb8383c8fdc..efb8383c8fdc 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 c4a8e480ed40..c4a8e480ed40 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 235fc1f928c0..235fc1f928c0 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 504d91212874..504d91212874 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/supervise_api/default.nix b/nixpkgs/pkgs/development/python-modules/supervise_api/default.nix
index 47cdc8a28b11..47cdc8a28b11 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 c5538ddc26e2..c5538ddc26e2 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 4771ba7a89d1..4771ba7a89d1 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 b4c5fdf4022e..b4c5fdf4022e 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 0e9f4f43656b..0e9f4f43656b 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 3a11bf67e13e..3a11bf67e13e 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 36f6dc06850f..36f6dc06850f 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 1772e8794ffd..1772e8794ffd 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 dc4b99c40a7a..dc4b99c40a7a 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/sybase/default.nix b/nixpkgs/pkgs/development/python-modules/sybase/default.nix
index 51c80e0fa910..51c80e0fa910 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 8b1677a7b843..8b1677a7b843 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 a2c0578f0c7f..a2c0578f0c7f 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 c09267662c17..c09267662c17 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 ec5b3b325dd2..ec5b3b325dd2 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/tableaudocumentapi/default.nix b/nixpkgs/pkgs/development/python-modules/tableaudocumentapi/default.nix
index a2f8fbb2f536..a2f8fbb2f536 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/default.nix b/nixpkgs/pkgs/development/python-modules/tables/default.nix
index 7b1b4f7c36f3..7b1b4f7c36f3 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 9f1bf2390b6a..9f1bf2390b6a 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 7321848afd02..7321848afd02 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/tarman/default.nix b/nixpkgs/pkgs/development/python-modules/tarman/default.nix
index 305daecc8de5..305daecc8de5 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/taskw/default.nix b/nixpkgs/pkgs/development/python-modules/taskw/default.nix
index d2d12ca0b962..d2d12ca0b962 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 8c7685c9d03b..8c7685c9d03b 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/tblib/default.nix b/nixpkgs/pkgs/development/python-modules/tblib/default.nix
index 37091da1b499..37091da1b499 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/telegram/default.nix b/nixpkgs/pkgs/development/python-modules/telegram/default.nix
index df45aaaee3bc..df45aaaee3bc 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 b74fe9dc0de4..b74fe9dc0de4 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 334163114a18..334163114a18 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 318c47d21608..318c47d21608 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 861054ed948f..861054ed948f 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 3540bebd1960..3540bebd1960 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 127e7560679a..127e7560679a 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 0f03adfccf5c..0f03adfccf5c 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 fa1759119c9e..fa1759119c9e 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 d02a4e1b9f29..d02a4e1b9f29 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/default.nix b/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix
index a8f902fdb38f..a8f902fdb38f 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/prefetcher.sh b/nixpkgs/pkgs/development/python-modules/tensorflow/prefetcher.sh
index 3059340d127d..3059340d127d 100644
--- 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/tf1.14.0-hashes.nix b/nixpkgs/pkgs/development/python-modules/tensorflow/tf1.14.0-hashes.nix
index f6b367aea383..f6b367aea383 100644
--- a/pkgs/development/python-modules/tensorflow/tf1.14.0-hashes.nix
+++ b/nixpkgs/pkgs/development/python-modules/tensorflow/tf1.14.0-hashes.nix
diff --git a/pkgs/development/python-modules/termcolor/default.nix b/nixpkgs/pkgs/development/python-modules/termcolor/default.nix
index 2931f0e51999..2931f0e51999 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 bebe8c3d1f8e..bebe8c3d1f8e 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 bb6961f77ecf..bb6961f77ecf 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 0a1c4e764129..0a1c4e764129 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 987fbf010197..987fbf010197 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/testfixtures/default.nix b/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix
index f9d35297306c..f9d35297306c 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 8bdd50f52d25..8bdd50f52d25 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 188c320e761a..188c320e761a 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 fa4fc0b1fedf..fa4fc0b1fedf 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 6fddc17af322..6fddc17af322 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 1a99378a541b..1a99378a541b 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 94aebc595123..94aebc595123 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 05121f2b9b28..05121f2b9b28 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 395deff22261..395deff22261 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/tflearn/default.nix b/nixpkgs/pkgs/development/python-modules/tflearn/default.nix
index 03185ae4d9fe..03185ae4d9fe 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 cd4a30f656ae..cd4a30f656ae 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 ebca1346dfb3..ebca1346dfb3 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 b3d7f58c66dc..b3d7f58c66dc 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 d5a83832cb27..d5a83832cb27 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 4a2d9df06181..4a2d9df06181 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 720391772b5d..720391772b5d 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 2a1240526abb..2a1240526abb 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 9a0876548e55..9a0876548e55 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 7f4ec5764bb2..7f4ec5764bb2 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/tilestache/default.nix b/nixpkgs/pkgs/development/python-modules/tilestache/default.nix
index 2b0fc68ca4c4..2b0fc68ca4c4 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 39ff4b6de15e..39ff4b6de15e 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 af1a85c96271..af1a85c96271 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/tinycss/default.nix b/nixpkgs/pkgs/development/python-modules/tinycss/default.nix
index 223d778095af..223d778095af 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 894d4f737fb6..894d4f737fb6 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 27ec511c55f6..27ec511c55f6 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/tiros/default.nix b/nixpkgs/pkgs/development/python-modules/tiros/default.nix
index edc4bbdebb13..edc4bbdebb13 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 895700f681e8..895700f681e8 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 e25d871f978d..e25d871f978d 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 bd242c62ab8d..bd242c62ab8d 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 3a21ce57fe7a..3a21ce57fe7a 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 88b417931808..88b417931808 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 848c114543d2..848c114543d2 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 ac68019d3695..ac68019d3695 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 fb1cdd0a4711..fb1cdd0a4711 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 87b62cd78ac1..87b62cd78ac1 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 6f3eae60c635..6f3eae60c635 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 2c43ebf2c7e7..2c43ebf2c7e7 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 24f54b98a96e..24f54b98a96e 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 08f3f87321fe..08f3f87321fe 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 29d0a4c692f3..29d0a4c692f3 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 1c87a3f18379..1c87a3f18379 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 974e3a43bc7c..974e3a43bc7c 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 dd1156f4355c..dd1156f4355c 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 0915bc300c54..0915bc300c54 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 1d8a03578cda..1d8a03578cda 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 772128c68608..772128c68608 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 c5701902e08c..c5701902e08c 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 fe15285f0653..fe15285f0653 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 843f26508ae4..843f26508ae4 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/traitlets/default.nix b/nixpkgs/pkgs/development/python-modules/traitlets/default.nix
index 0f18c6693869..0f18c6693869 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 bfc3ae475ebb..bfc3ae475ebb 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 20f124854354..20f124854354 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/transitions/default.nix b/nixpkgs/pkgs/development/python-modules/transitions/default.nix
index 059289ec4219..059289ec4219 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 91ac8f062567..91ac8f062567 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 932045b6502d..932045b6502d 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 f49c7a0d2430..f49c7a0d2430 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 589878d69f52..589878d69f52 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 e0c5329d23fc..e0c5329d23fc 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 f76939603d38..f76939603d38 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 4cd4776f0da9..4cd4776f0da9 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 4923bded9493..4923bded9493 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 2106e4d2e76c..2106e4d2e76c 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 6daa99aca6a6..6daa99aca6a6 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 042b4a196421..042b4a196421 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 767bb21f0fd4..767bb21f0fd4 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 6c298dce7c7b..6c298dce7c7b 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 bc2f8807eaa7..bc2f8807eaa7 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 ed50c28f4c38..ed50c28f4c38 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 9a87c684f1be..9a87c684f1be 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 f7772492dfd3..f7772492dfd3 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 097e691f7c18..097e691f7c18 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 a49e994019e7..a49e994019e7 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 10b25460cefc..10b25460cefc 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 d562eac5cc7d..d562eac5cc7d 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 1253b8077e75..1253b8077e75 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 df2f614c5a04..df2f614c5a04 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 59f6d74ad67a..59f6d74ad67a 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 1c3d1808f5dd..1c3d1808f5dd 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 12e55a46ab8e..12e55a46ab8e 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 2e8481198a41..2e8481198a41 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/txaio/default.nix b/nixpkgs/pkgs/development/python-modules/txaio/default.nix
index 7fb1b9e5b5cd..7fb1b9e5b5cd 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 2c3ee66663f6..2c3ee66663f6 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 5340b202e688..5340b202e688 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 ee7d09d51657..ee7d09d51657 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 91e83250d8b0..91e83250d8b0 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 f540cf72877a..f540cf72877a 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 7fb6f8fef435..7fb6f8fef435 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 3aeb84113c2d..3aeb84113c2d 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/typing-extensions/default.nix b/nixpkgs/pkgs/development/python-modules/typing-extensions/default.nix
index daaafbd7b3ec..daaafbd7b3ec 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 5c5ecd8949a2..5c5ecd8949a2 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 f5724877bf2b..f5724877bf2b 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 8320500fc141..8320500fc141 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 144f9299c6eb..144f9299c6eb 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 cd004c59d4a4..cd004c59d4a4 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/uarray/default.nix b/nixpkgs/pkgs/development/python-modules/uarray/default.nix
index fad2dee2d165..fad2dee2d165 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/ujson/default.nix b/nixpkgs/pkgs/development/python-modules/ujson/default.nix
index a9d68978c3b0..a9d68978c3b0 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 42588347c851..42588347c851 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 a41921a9d8cf..a41921a9d8cf 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/umemcache/default.nix b/nixpkgs/pkgs/development/python-modules/umemcache/default.nix
index 416c857bdc68..416c857bdc68 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 6e357f307e3a..6e357f307e3a 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 f300ed727512..f300ed727512 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/unicodecsv/default.nix b/nixpkgs/pkgs/development/python-modules/unicodecsv/default.nix
index d0f54a7c6b2b..d0f54a7c6b2b 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 35afe10f8d24..35afe10f8d24 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 13f0053f143c..13f0053f143c 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 81e9019f489c..81e9019f489c 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 d7a8e6eaf04d..d7a8e6eaf04d 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 02a3fc940aee..02a3fc940aee 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-xml-reporting/default.nix b/nixpkgs/pkgs/development/python-modules/unittest-xml-reporting/default.nix
index 624ff585c36c..624ff585c36c 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 85ca7157e12c..85ca7157e12c 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 b69f894cb5cb..b69f894cb5cb 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 baf536fdbadd..baf536fdbadd 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 9ff1137fb565..9ff1137fb565 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_checker/default.nix b/nixpkgs/pkgs/development/python-modules/update_checker/default.nix
index ad401d80190d..ad401d80190d 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 54dfc5c112cc..54dfc5c112cc 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 9387ba778016..9387ba778016 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 035acbcec2b6..035acbcec2b6 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 6365846bd263..6365846bd263 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 c469fd8dd1cc..c469fd8dd1cc 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 6835f8c48e0a..6835f8c48e0a 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 528846d72381..528846d72381 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 d951e436480b..d951e436480b 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 365a65950f14..365a65950f14 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 915194459b24..915194459b24 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 53b5bc9ad166..53b5bc9ad166 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 bcbaa0b728c3..bcbaa0b728c3 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 a5dc414b2606..a5dc414b2606 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 5e31f6ccad09..5e31f6ccad09 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/uvloop/default.nix b/nixpkgs/pkgs/development/python-modules/uvloop/default.nix
index 9c3dae74a79e..9c3dae74a79e 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 ea2c5a8db749..ea2c5a8db749 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/validictory/default.nix b/nixpkgs/pkgs/development/python-modules/validictory/default.nix
index c27d13ab8f12..c27d13ab8f12 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 13f7753831b4..13f7753831b4 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 ffe184e263ab..ffe184e263ab 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/vega/default.nix b/nixpkgs/pkgs/development/python-modules/vega/default.nix
index f6a9f3153f14..f6a9f3153f14 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 af1489df0358..af1489df0358 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 f420d88e816e..f420d88e816e 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/versioneer/default.nix b/nixpkgs/pkgs/development/python-modules/versioneer/default.nix
index a33286714173..a33286714173 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 e92dbae8138e..e92dbae8138e 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 8d71e6331f5b..8d71e6331f5b 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 7003b9e1b043..7003b9e1b043 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/vine/default.nix b/nixpkgs/pkgs/development/python-modules/vine/default.nix
index c3ee5237935e..c3ee5237935e 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 cf62704e8bec..cf62704e8bec 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 130c94bc1701..130c94bc1701 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 b1ce764c4ac4..b1ce764c4ac4 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 bad23341df72..bad23341df72 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 4378e00bb1fc..4378e00bb1fc 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 19ec56a1ece8..19ec56a1ece8 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 78dc29bbeb0e..78dc29bbeb0e 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 25cd5b9a90d7..25cd5b9a90d7 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 95cf6efaa46a..95cf6efaa46a 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 29515f75c9e0..29515f75c9e0 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 b45a46b3a839..b45a46b3a839 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 a91de2d7eeed..a91de2d7eeed 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 645956594bf6..645956594bf6 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/vultr/default.nix b/nixpkgs/pkgs/development/python-modules/vultr/default.nix
index e66e21f01a66..e66e21f01a66 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 7bae1e9860be..7bae1e9860be 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 b71bc7dc928d..b71bc7dc928d 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 c230cd9cfa6e..c230cd9cfa6e 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 07f7b326fdaf..07f7b326fdaf 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 b710086c22b9..b710086c22b9 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 fb39ae9fc7a8..fb39ae9fc7a8 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 b5c9e14da355..b5c9e14da355 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 bc298b2794df..bc298b2794df 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 ef6089baa507..ef6089baa507 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 01a9a4034d59..01a9a4034d59 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 e785f5efa796..e785f5efa796 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 39ce62ca47c7..39ce62ca47c7 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 7dc09d58aad6..7dc09d58aad6 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 eabbdbdcd6ee..eabbdbdcd6ee 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 fb777ad4129b..fb777ad4129b 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 584440eab6ae..584440eab6ae 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 a8a4e474f538..a8a4e474f538 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 d530eda39d97..d530eda39d97 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 c4ab0dd59cad..c4ab0dd59cad 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 37f9735f47c2..37f9735f47c2 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 bd2e0574a476..bd2e0574a476 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 d78cb7f3de9c..d78cb7f3de9c 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/websocket_client/default.nix b/nixpkgs/pkgs/development/python-modules/websocket_client/default.nix
index ad830a0890ae..ad830a0890ae 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 2e0caae4b469..2e0caae4b469 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 a9758580a445..a9758580a445 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 d8482872bc34..d8482872bc34 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 cbf82ca7ca3d..cbf82ca7ca3d 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/wheel/default.nix b/nixpkgs/pkgs/development/python-modules/wheel/default.nix
index d7814984060e..d7814984060e 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 498c1c401f81..498c1c401f81 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 f9565d8e6a05..f9565d8e6a05 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 b7812b42e66d..b7812b42e66d 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 a7b34cf9b364..a7b34cf9b364 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 ab2bd9c4eb18..ab2bd9c4eb18 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/wikipedia/default.nix b/nixpkgs/pkgs/development/python-modules/wikipedia/default.nix
index 19b7c42558ec..19b7c42558ec 100644
--- a/pkgs/development/python-modules/wikipedia/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/wikipedia/default.nix
diff --git a/pkgs/development/python-modules/willow/default.nix b/nixpkgs/pkgs/development/python-modules/willow/default.nix
index fb9182ab1792..fb9182ab1792 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 d61567f92242..d61567f92242 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 d672cb8bae90..d672cb8bae90 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 103e2fc8defd..103e2fc8defd 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 12172c376c95..12172c376c95 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 9247a7c77576..9247a7c77576 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 8d1443837cde..8d1443837cde 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 60f0f3cc9696..60f0f3cc9696 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 8ae8b4aefa54..8ae8b4aefa54 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 4877e5f66f25..4877e5f66f25 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/default.nix b/nixpkgs/pkgs/development/python-modules/wsproto/default.nix
index 36aaf0ec8ceb..36aaf0ec8ceb 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/wtforms/default.nix b/nixpkgs/pkgs/development/python-modules/wtforms/default.nix
index 40f0b6554515..40f0b6554515 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 322c85b5810b..322c85b5810b 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 584200ff2b09..584200ff2b09 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 c953fe9fe1e3..c953fe9fe1e3 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 060d08869b88..060d08869b88 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 55a3ad7d0cce..55a3ad7d0cce 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/xarray/default.nix b/nixpkgs/pkgs/development/python-modules/xarray/default.nix
index 930729c052e1..930729c052e1 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 c8940b54c46c..c8940b54c46c 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 7dc670720465..7dc670720465 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 e8643a6b540d..e8643a6b540d 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 e5d06a3c6943..e5d06a3c6943 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 14f4b24747c7..14f4b24747c7 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 bbe7c9862606..bbe7c9862606 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 86c628c694bf..86c628c694bf 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 d5a666856464..d5a666856464 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 9ea1445eff59..9ea1445eff59 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 1903c3aaca88..1903c3aaca88 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 e37b2694576a..e37b2694576a 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 5faf56b7eba7..5faf56b7eba7 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 5de0348e00e9..5de0348e00e9 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 f737cf344b88..f737cf344b88 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/xmltodict/default.nix b/nixpkgs/pkgs/development/python-modules/xmltodict/default.nix
index 07250337f838..07250337f838 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/xmpppy/default.nix b/nixpkgs/pkgs/development/python-modules/xmpppy/default.nix
index ec725564f2b2..ec725564f2b2 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 915602dc23e5..915602dc23e5 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 558e414debf8..558e414debf8 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 1f60a0fbe6cf..1f60a0fbe6cf 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 a474bf84d0fd..a474bf84d0fd 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 e4352e3b9843..e4352e3b9843 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 3424c8fcf6f2..3424c8fcf6f2 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 8e3f084ca7f0..8e3f084ca7f0 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 956d331e7b89..956d331e7b89 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 bbfcce54d890..bbfcce54d890 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 c7708d0f20b7..c7708d0f20b7 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 da9ec8dc2d97..da9ec8dc2d97 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 38c060aa8e84..38c060aa8e84 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 b22b9554fa61..b22b9554fa61 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 690b110fc93a..690b110fc93a 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 78e97014189b..78e97014189b 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/yapsy/default.nix b/nixpkgs/pkgs/development/python-modules/yapsy/default.nix
index 9aa1985270dd..9aa1985270dd 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 f49ed20b2b92..f49ed20b2b92 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 d07690503f30..d07690503f30 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 89a9e1abdc46..89a9e1abdc46 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 3c51d00ec148..3c51d00ec148 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 fe7f0cf466e1..fe7f0cf466e1 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/argparse-dependency.patch b/nixpkgs/pkgs/development/python-modules/yowsup/argparse-dependency.patch
index e2b9f0c9a74c..e2b9f0c9a74c 100644
--- a/pkgs/development/python-modules/yowsup/argparse-dependency.patch
+++ b/nixpkgs/pkgs/development/python-modules/yowsup/argparse-dependency.patch
diff --git a/pkgs/development/python-modules/yowsup/default.nix b/nixpkgs/pkgs/development/python-modules/yowsup/default.nix
index 5fa4af18c089..5fa4af18c089 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/yubico-client/default.nix b/nixpkgs/pkgs/development/python-modules/yubico-client/default.nix
index ddd992a51447..ddd992a51447 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 143f609d8338..143f609d8338 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/zbaemon/default.nix b/nixpkgs/pkgs/development/python-modules/zbaemon/default.nix
index c15e46e5d0d8..c15e46e5d0d8 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 a5002e80f494..a5002e80f494 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 110b7000e735..110b7000e735 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 f68164284dad..f68164284dad 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 6b3d3266b21b..6b3d3266b21b 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 c15e46e5d0d8..c15e46e5d0d8 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 da6bdcde463f..da6bdcde463f 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 d1cab88b45b8..d1cab88b45b8 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/zeroconf/default.nix b/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix
index dbf84aa182b0..dbf84aa182b0 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 2ad01586189b..2ad01586189b 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 89e9e9691401..89e9e9691401 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 9193c2ddc081..9193c2ddc081 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/zict/default.nix b/nixpkgs/pkgs/development/python-modules/zict/default.nix
index 81e5d0fbc815..81e5d0fbc815 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/zipfile36/default.nix b/nixpkgs/pkgs/development/python-modules/zipfile36/default.nix
index 2148dcc4b802..2148dcc4b802 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 29153b068fca..29153b068fca 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 4d5fabe7fca0..4d5fabe7fca0 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 72c32ef8277f..72c32ef8277f 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 c79352085368..c79352085368 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 1e577fc487ca..1e577fc487ca 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 f447d29f2804..f447d29f2804 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 0b7bc80bf3a6..0b7bc80bf3a6 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 df3a2053ebf8..df3a2053ebf8 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 bbe635b712ff..bbe635b712ff 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 e0ec7bd6ca80..e0ec7bd6ca80 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 9dac64907be9..9dac64907be9 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 4d6e740278e8..4d6e740278e8 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 b56e19697119..b56e19697119 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 d2a21fd03b04..d2a21fd03b04 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 3dea7adcb002..3dea7adcb002 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 dbbba691edbe..dbbba691edbe 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 36d664efd1a0..36d664efd1a0 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 aad822bca594..aad822bca594 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 cddcad007746..cddcad007746 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 a5855697ad6f..a5855697ad6f 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 738b30c489f5..738b30c489f5 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 7c0df16f7751..7c0df16f7751 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 08932c1cba19..08932c1cba19 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 df5322acc87f..df5322acc87f 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 8651e2d6822f..8651e2d6822f 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 037c5d87f9af..037c5d87f9af 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 fd2cf470e6f0..fd2cf470e6f0 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 08b1d67ffee5..08b1d67ffee5 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 8c9a0af142cb..8c9a0af142cb 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 e6fd09d76471..e6fd09d76471 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 863d7c9fcfe0..863d7c9fcfe0 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 04f4d25def24..04f4d25def24 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 82727234124b..82727234124b 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 eca1fda4f6f5..eca1fda4f6f5 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 f00748437745..f00748437745 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 1586b5b16b3a..1586b5b16b3a 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 beb378275087..beb378275087 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 76bf29abc17c..76bf29abc17c 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 b357d7f83fcc..b357d7f83fcc 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 afc9de3a95a9..afc9de3a95a9 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 f2dc49bd4766..f2dc49bd4766 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 dcd9b61798bd..dcd9b61798bd 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 1ffe17e55420..1ffe17e55420 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 14427b72630e..14427b72630e 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 04239d721c07..04239d721c07 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 2ca0d42c6db4..2ca0d42c6db4 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 c89773c2dd55..c89773c2dd55 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 76e819501a57..76e819501a57 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 d6a8f3ddbc66..d6a8f3ddbc66 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 c31dfb63b3cd..c31dfb63b3cd 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 6324f27e9faf..6324f27e9faf 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 fe8c43f55ed1..fe8c43f55ed1 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 ab03f48445b3..ab03f48445b3 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 f8843c615821..f8843c615821 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 5d1489ba2005..5d1489ba2005 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 8fdbafbba425..8fdbafbba425 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 b/nixpkgs/pkgs/development/ruby-modules/bundler-env/test/Gemfile
index e69de29bb2d1..e69de29bb2d1 100644
--- a/pkgs/development/ruby-modules/bundler-env/test/Gemfile
+++ b/nixpkgs/pkgs/development/ruby-modules/bundler-env/test/Gemfile
diff --git a/pkgs/development/ruby-modules/bundler-env/test/Gemfile.lock b/nixpkgs/pkgs/development/ruby-modules/bundler-env/test/Gemfile.lock
index e69de29bb2d1..e69de29bb2d1 100644
--- a/pkgs/development/ruby-modules/bundler-env/test/Gemfile.lock
+++ 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 53f15f96bc6d..53f15f96bc6d 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/default.nix b/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix
index decde250ac23..decde250ac23 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 eb136d4c2435..eb136d4c2435 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/mkrf_conf_xapian.rb b/nixpkgs/pkgs/development/ruby-modules/gem-config/mkrf_conf_xapian.rb
index e19f06e23ac2..e19f06e23ac2 100644
--- a/pkgs/development/ruby-modules/gem-config/mkrf_conf_xapian.rb
+++ b/nixpkgs/pkgs/development/ruby-modules/gem-config/mkrf_conf_xapian.rb
diff --git a/pkgs/development/ruby-modules/gem-config/xapian-Rakefile b/nixpkgs/pkgs/development/ruby-modules/gem-config/xapian-Rakefile
index 54412ff810b0..54412ff810b0 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/default.nix b/nixpkgs/pkgs/development/ruby-modules/gem/default.nix
index 7b92a586b54c..7b92a586b54c 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 f0322b67f61f..f0322b67f61f 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 142d2da9bee2..142d2da9bee2 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 8bb8c8a5462c..8bb8c8a5462c 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 fa41b7c1d216..fa41b7c1d216 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 ae3246c92778..ae3246c92778 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 2f60dacd358b..2f60dacd358b 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 5677801826a3..5677801826a3 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 f28cfcd508d4..f28cfcd508d4 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 65e7c8d4416d..65e7c8d4416d 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 aaab2f689602..aaab2f689602 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 74fcceebaa04..74fcceebaa04 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 43d10fca0444..43d10fca0444 100644
--- a/pkgs/development/ruby-modules/testing/testing.nix
+++ b/nixpkgs/pkgs/development/ruby-modules/testing/testing.nix
diff --git a/pkgs/development/tools/alloy/default.nix b/nixpkgs/pkgs/development/tools/alloy/default.nix
index 7ff5633072e1..7ff5633072e1 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 a76bd9480474..a76bd9480474 100644
--- a/pkgs/development/tools/alloy/icon.png
+++ b/nixpkgs/pkgs/development/tools/alloy/icon.png
Binary files differdiff --git a/pkgs/development/tools/ammonite/default.nix b/nixpkgs/pkgs/development/tools/ammonite/default.nix
index d4edbf44a798..d4edbf44a798 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 a8b8a965256f..a8b8a965256f 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/brakeman/default.nix b/nixpkgs/pkgs/development/tools/analysis/brakeman/default.nix
index 78a4396698b6..78a4396698b6 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 9454e3b18ad1..9454e3b18ad1 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 a46d7f9d9536..a46d7f9d9536 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 a1dfd91c29fe..a1dfd91c29fe 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 bcb3ac1d146a..bcb3ac1d146a 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 2e01e4d8f28e..2e01e4d8f28e 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 2b4a87ffcb8d..2b4a87ffcb8d 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/cov-build/default.nix b/nixpkgs/pkgs/development/tools/analysis/cov-build/default.nix
index bd0a4ee5e40a..bd0a4ee5e40a 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/cppcheck/default.nix b/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix
index 09901afdd20b..09901afdd20b 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 10ed99e3ffe6..10ed99e3ffe6 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 6259756794df..6259756794df 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 1bd24b4785d0..1bd24b4785d0 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 00c020e3f404..00c020e3f404 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 77bfa548068c..77bfa548068c 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 7f2df62008f0..7f2df62008f0 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 62c781e1c9df..62c781e1c9df 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 29a190220944..29a190220944 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/frama-c/dynamic.diff b/nixpkgs/pkgs/development/tools/analysis/frama-c/dynamic.diff
index 737cad0cda4f..737cad0cda4f 100644
--- a/pkgs/development/tools/analysis/frama-c/dynamic.diff
+++ b/nixpkgs/pkgs/development/tools/analysis/frama-c/dynamic.diff
diff --git a/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix b/nixpkgs/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix
index f96f7e9b66bd..f96f7e9b66bd 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 48301bbf61ad..48301bbf61ad 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 557fa8384746..557fa8384746 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 7158ea38c04d..7158ea38c04d 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 89ffbff3db71..89ffbff3db71 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 6f3df32f3c04..6f3df32f3c04 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 4222f72248a8..4222f72248a8 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 939ae10c089d..939ae10c089d 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 af20165d155f..af20165d155f 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 06c712588f8f..06c712588f8f 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 7afa71429a75..7afa71429a75 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 a9793e048839..a9793e048839 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/panopticon/default.nix b/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix
index 300feb9a41b5..300feb9a41b5 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 8e8f438b5e1a..8e8f438b5e1a 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 2ab9f12c7796..2ab9f12c7796 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 fb0f7414841c..fb0f7414841c 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 c92cdb19ae28..c92cdb19ae28 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 0c383b5f83f6..0c383b5f83f6 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 794581bca7ad..794581bca7ad 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 4fc85c301665..4fc85c301665 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 fec127178f9e..fec127178f9e 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 cc857b86145f..cc857b86145f 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 cd2fb21209c4..cd2fb21209c4 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 9dc1e2db8c09..9dc1e2db8c09 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 e965acc746cc..e965acc746cc 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 945f6c80af52..945f6c80af52 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 fbb7eca0ef51..fbb7eca0ef51 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 8c435707571d..8c435707571d 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 57a83e54d705..57a83e54d705 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 01402ce943bc..01402ce943bc 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 86e4d6ef5f69..86e4d6ef5f69 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 aab6869ecb8c..aab6869ecb8c 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/uefi-firmware-parser/default.nix b/nixpkgs/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix
index 0ad042d74def..0ad042d74def 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 cd09f0edff37..cd09f0edff37 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 c362ae5734cb..c362ae5734cb 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 1ecdd9f32ce5..1ecdd9f32ce5 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 d9d70f64d73e..d9d70f64d73e 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 d2cb7e807b58..d2cb7e807b58 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 0288fc206d49..0288fc206d49 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 e0b9aec9ee15..e0b9aec9ee15 100644
--- a/pkgs/development/tools/asn2quickder/default.nix
+++ b/nixpkgs/pkgs/development/tools/asn2quickder/default.nix
diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix
index 73adfaec8386..73adfaec8386 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 2089142a1deb..2089142a1deb 100644
--- a/pkgs/development/tools/azcopy/default.nix
+++ b/nixpkgs/pkgs/development/tools/azcopy/default.nix
diff --git a/pkgs/development/tools/azcopy/deps.nix b/nixpkgs/pkgs/development/tools/azcopy/deps.nix
index cef400200d06..cef400200d06 100644
--- a/pkgs/development/tools/azcopy/deps.nix
+++ b/nixpkgs/pkgs/development/tools/azcopy/deps.nix
diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix
index 831ed1e97ace..831ed1e97ace 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 db04c2026d8d..db04c2026d8d 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 010ba56165d9..010ba56165d9 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 27db701ef546..27db701ef546 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 f66c84142648..f66c84142648 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 7b5391725423..7b5391725423 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 89c1b560eaca..89c1b560eaca 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 c50e57160639..c50e57160639 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 8816a005ca0f..8816a005ca0f 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 b6c2702485b1..b6c2702485b1 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 8d06352b1356..8d06352b1356 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 cde6ea2f7a87..cde6ea2f7a87 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 0aec7491e4ad..0aec7491e4ad 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 624821613465..624821613465 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/0.4.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/0.4.nix
index 1018abd6ee9c..1018abd6ee9c 100644
--- a/pkgs/development/tools/build-managers/bazel/0.4.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/0.4.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 898640a84fe6..898640a84fe6 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 6fdb57345072..6fdb57345072 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 0d821fa61660..0d821fa61660 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/buildtools/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
index 2e8f806d53aa..2e8f806d53aa 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 d7cd02c12b8b..d7cd02c12b8b 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 2b59bd3c4338..2b59bd3c4338 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 bad0023eef32..bad0023eef32 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 5f780a795e31..5f780a795e31 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-0.4.patch b/nixpkgs/pkgs/development/tools/build-managers/bazel/nix-hacks-0.4.patch
index 563fe635e6b0..563fe635e6b0 100644
--- a/pkgs/development/tools/build-managers/bazel/nix-hacks-0.4.patch
+++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/nix-hacks-0.4.patch
diff --git a/pkgs/development/tools/build-managers/bazel/nix-hacks.patch b/nixpkgs/pkgs/development/tools/build-managers/bazel/nix-hacks.patch
index f58be89fabc1..f58be89fabc1 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 90065be67bc7..90065be67bc7 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 ff921b395da7..ff921b395da7 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/python-stub-path-fix.patch b/nixpkgs/pkgs/development/tools/build-managers/bazel/python-stub-path-fix.patch
index cbc4192d2d9b..cbc4192d2d9b 100644
--- a/pkgs/development/tools/build-managers/bazel/python-stub-path-fix.patch
+++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/python-stub-path-fix.patch
diff --git a/pkgs/development/tools/build-managers/bazel/src-deps.json b/nixpkgs/pkgs/development/tools/build-managers/bazel/src-deps.json
index a0d07f1a68d4..a0d07f1a68d4 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/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 b93b252f3638..b93b252f3638 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 7fd1e5e2b048..7fd1e5e2b048 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 d237267078e6..d237267078e6 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 5999525def08..5999525def08 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 8effc723bbab..8effc723bbab 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 c20985f31dc4..c20985f31dc4 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 9b1267257ad1..9b1267257ad1 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 f71b877c8c52..f71b877c8c52 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 339348f37c32..339348f37c32 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 c1481dc6a144..c1481dc6a144 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 380ba4803bd5..380ba4803bd5 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 30e88b497ad9..30e88b497ad9 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 b8726e64a604..b8726e64a604 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 ac438080b9ab..ac438080b9ab 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 982aba17e874..982aba17e874 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 0373ca2d67cd..0373ca2d67cd 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 4761d8dc5b11..4761d8dc5b11 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 c5b9cdff1d07..c5b9cdff1d07 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 9fc949661686..9fc949661686 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 2f5e4d62c86d..2f5e4d62c86d 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 8c6b11bd73e7..8c6b11bd73e7 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 9f4cb366e239..9f4cb366e239 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 9c5d22ee07b3..9c5d22ee07b3 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 6fc03a550940..6fc03a550940 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 ddb13a65c165..ddb13a65c165 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 52060a0e6254..52060a0e6254 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 a7bb93d52ed1..a7bb93d52ed1 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 061ed5d973ab..061ed5d973ab 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 7b882926e1f5..7b882926e1f5 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 d89c5fdbabde..d89c5fdbabde 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 75d2edcaf1c6..75d2edcaf1c6 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 47f800c67be5..47f800c67be5 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 186212d0d298..186212d0d298 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 f6646f1d0126..f6646f1d0126 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 5a03acb2f7ca..5a03acb2f7ca 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 25ff6d09d420..25ff6d09d420 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 baa658b522a3..baa658b522a3 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 c5ab3fafc5e6..c5ab3fafc5e6 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 7314643530e8..7314643530e8 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 8a72847be772..8a72847be772 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 1821ac6bbb73..1821ac6bbb73 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 d73683287a1e..d73683287a1e 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 bce8dedbf58a..bce8dedbf58a 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 591927c15285..591927c15285 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 b5ee5d758170..b5ee5d758170 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-objc-linking.patch b/nixpkgs/pkgs/development/tools/build-managers/meson/fix-objc-linking.patch
index 60a205828f5d..60a205828f5d 100644
--- a/pkgs/development/tools/build-managers/meson/fix-objc-linking.patch
+++ b/nixpkgs/pkgs/development/tools/build-managers/meson/fix-objc-linking.patch
diff --git a/pkgs/development/tools/build-managers/meson/fix-rpath.patch b/nixpkgs/pkgs/development/tools/build-managers/meson/fix-rpath.patch
index 1a5f8cb89dce..1a5f8cb89dce 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 7a33d4127fae..7a33d4127fae 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 6e8d94523e14..6e8d94523e14 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 ff49bea526a1..ff49bea526a1 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 73678ae9f5cc..73678ae9f5cc 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 f510752d385a..f510752d385a 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/ninja/default.nix b/nixpkgs/pkgs/development/tools/build-managers/ninja/default.nix
index 796747bf6e9c..796747bf6e9c 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 e3c67bd139dd..e3c67bd139dd 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 9757d8cda8d1..9757d8cda8d1 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 266dff8cf6ce..266dff8cf6ce 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 bd1ff6faa65c..bd1ff6faa65c 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 992a0bc8929f..992a0bc8929f 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 8de0130d31bd..8de0130d31bd 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 05a59cff850f..05a59cff850f 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 98cd7e136d22..98cd7e136d22 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 341585744a6e..341585744a6e 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 802f47af6adf..802f47af6adf 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-sh/default.nix b/nixpkgs/pkgs/development/tools/build-managers/redo-sh/default.nix
index 3036ef235845..3036ef235845 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 97b82d204ad2..97b82d204ad2 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 3eca6f02e45d..3eca6f02e45d 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 ef876e2fb237..ef876e2fb237 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 e0cfe59b0516..e0cfe59b0516 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 8110027b6cfc..8110027b6cfc 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 70038ed2d3a4..70038ed2d3a4 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 740d04d853f7..740d04d853f7 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 ce15de8678d6..ce15de8678d6 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 a963bf78abab..a963bf78abab 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 55159aa5a93a..55159aa5a93a 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 00345179131a..00345179131a 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 19256e39c33c..19256e39c33c 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 c3346ad7e993..c3346ad7e993 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 4184bd5fe8cd..4184bd5fe8cd 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 3da86d3201f5..3da86d3201f5 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 3c04f8a12af6..3c04f8a12af6 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/nixpkgs/pkgs/development/tools/buildah/default.nix
diff --git a/pkgs/development/tools/cachix/default.nix b/nixpkgs/pkgs/development/tools/cachix/default.nix
index 3a6380698af0..3a6380698af0 100644
--- a/pkgs/development/tools/cachix/default.nix
+++ b/nixpkgs/pkgs/development/tools/cachix/default.nix
diff --git a/pkgs/development/tools/cadre/Gemfile b/nixpkgs/pkgs/development/tools/cadre/Gemfile
index aa42f75c95cf..aa42f75c95cf 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 c14df9cffa61..c14df9cffa61 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 93eb32cfb514..93eb32cfb514 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 33fd428debf2..33fd428debf2 100644
--- a/pkgs/development/tools/cadre/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/cadre/gemset.nix
diff --git a/pkgs/development/tools/cargo-web/default.nix b/nixpkgs/pkgs/development/tools/cargo-web/default.nix
index 262a3d31742a..262a3d31742a 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 e33761a67e02..e33761a67e02 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 e07b3cd9db74..e07b3cd9db74 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 653d0d4505e7..653d0d4505e7 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 798e507460eb..798e507460eb 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 0d129765aa4a..0d129765aa4a 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 049d9f38c0c1..049d9f38c0c1 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 2de0e9a647a7..2de0e9a647a7 100644
--- a/pkgs/development/tools/cbor-diag/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/cbor-diag/gemset.nix
diff --git a/pkgs/development/tools/cddl/Gemfile b/nixpkgs/pkgs/development/tools/cddl/Gemfile
index 2ba729084f1a..2ba729084f1a 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 65701dd45bf8..65701dd45bf8 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 37ad593d7964..37ad593d7964 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 92aa41995051..92aa41995051 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 ecdee5d544f6..ecdee5d544f6 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 7981681a6414..7981681a6414 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 dfa164e6755c..dfa164e6755c 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 b9c50d95d117..b9c50d95d117 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 4d9640c8e9f9..4d9640c8e9f9 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 545375d87805..545375d87805 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 1d81d469eb29..1d81d469eb29 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 228b3cd85135..228b3cd85135 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 b312b888e908..b312b888e908 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 0fcaee574681..0fcaee574681 100644
--- a/pkgs/development/tools/clang-tools/default.nix
+++ b/nixpkgs/pkgs/development/tools/clang-tools/default.nix
diff --git a/pkgs/development/tools/clog-cli/default.nix b/nixpkgs/pkgs/development/tools/clog-cli/default.nix
index 0c8e6ff591bf..0c8e6ff591bf 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 f452b24cf079..f452b24cf079 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 ffd50762ee2e..ffd50762ee2e 100644
--- a/pkgs/development/tools/cloud-nuke/deps.nix
+++ b/nixpkgs/pkgs/development/tools/cloud-nuke/deps.nix
diff --git a/pkgs/development/tools/cloudfoundry-cli/default.nix b/nixpkgs/pkgs/development/tools/cloudfoundry-cli/default.nix
index 70d0acfec884..70d0acfec884 100644
--- a/pkgs/development/tools/cloudfoundry-cli/default.nix
+++ b/nixpkgs/pkgs/development/tools/cloudfoundry-cli/default.nix
diff --git a/pkgs/development/tools/compass/Gemfile b/nixpkgs/pkgs/development/tools/compass/Gemfile
index 66a29975e7dd..66a29975e7dd 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 43790d9e7a1e..43790d9e7a1e 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 c47bddd4d9c3..c47bddd4d9c3 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 1beb3d3fec00..1beb3d3fec00 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 db7df2af7009..db7df2af7009 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 53771ddad9f0..53771ddad9f0 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 192938473e05..192938473e05 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 b2b903b095c6..b2b903b095c6 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/2.x.nix b/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/2.x.nix
index 6a73e2581822..6a73e2581822 100644
--- a/pkgs/development/tools/continuous-integration/buildkite-agent/2.x.nix
+++ b/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/2.x.nix
diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix b/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix
index e8266c2efe2c..e8266c2efe2c 100644
--- a/pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix
+++ b/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/3.x.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 ba0be89abf3d..ba0be89abf3d 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/cide/Gemfile b/nixpkgs/pkgs/development/tools/continuous-integration/cide/Gemfile
index 7e72ac0529d6..7e72ac0529d6 100644
--- a/pkgs/development/tools/continuous-integration/cide/Gemfile
+++ b/nixpkgs/pkgs/development/tools/continuous-integration/cide/Gemfile
diff --git a/pkgs/development/tools/continuous-integration/cide/Gemfile.lock b/nixpkgs/pkgs/development/tools/continuous-integration/cide/Gemfile.lock
index 736b2bfca1a2..736b2bfca1a2 100644
--- a/pkgs/development/tools/continuous-integration/cide/Gemfile.lock
+++ b/nixpkgs/pkgs/development/tools/continuous-integration/cide/Gemfile.lock
diff --git a/pkgs/development/tools/continuous-integration/cide/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/cide/default.nix
index 932a02cf2bcf..932a02cf2bcf 100644
--- a/pkgs/development/tools/continuous-integration/cide/default.nix
+++ b/nixpkgs/pkgs/development/tools/continuous-integration/cide/default.nix
diff --git a/pkgs/development/tools/continuous-integration/cide/gemset.nix b/nixpkgs/pkgs/development/tools/continuous-integration/cide/gemset.nix
index df8f7c9f2088..df8f7c9f2088 100644
--- a/pkgs/development/tools/continuous-integration/cide/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/continuous-integration/cide/gemset.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 4a4708df32dd..4a4708df32dd 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-cli/deps.nix b/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/deps.nix
index d6486db13951..d6486db13951 100644
--- a/pkgs/development/tools/continuous-integration/drone-cli/deps.nix
+++ b/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/deps.nix
diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix
index 81dbc54cece0..81dbc54cece0 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/drone/deps.nix b/nixpkgs/pkgs/development/tools/continuous-integration/drone/deps.nix
index 86059fba28d9..86059fba28d9 100644
--- a/pkgs/development/tools/continuous-integration/drone/deps.nix
+++ b/nixpkgs/pkgs/development/tools/continuous-integration/drone/deps.nix
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index 07be22ae43f5..07be22ae43f5 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 8aa419ea5f94..8aa419ea5f94 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 cdc4e6db2c2d..cdc4e6db2c2d 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 8982ca5f77ad..8982ca5f77ad 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 d7822886a5fd..d7822886a5fd 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 66d1b4ceff66..66d1b4ceff66 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 b7772dd659fa..b7772dd659fa 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 d48b141627c7..d48b141627c7 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 5f817ae498a7..5f817ae498a7 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 40ad1948394f..40ad1948394f 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 22d7b236ffa4..22d7b236ffa4 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 e395e098e6d1..e395e098e6d1 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 299e7d9d4992..299e7d9d4992 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 99f8d55bd87e..99f8d55bd87e 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 f738129eca4f..f738129eca4f 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 a9a2d073de4e..a9a2d073de4e 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 4a3ed7395500..4a3ed7395500 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 99d519a83b68..99d519a83b68 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 4187d0629509..4187d0629509 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 d5c7d309e98d..d5c7d309e98d 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 553d622a83c6..553d622a83c6 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 7eb34aa29ba4..7eb34aa29ba4 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 97bfc10b20af..97bfc10b20af 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 e136b180d78c..e136b180d78c 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 4589e6ff4e5b..4589e6ff4e5b 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 cbf1af440575..cbf1af440575 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/pgcli/default.nix b/nixpkgs/pkgs/development/tools/database/pgcli/default.nix
index 31ffff3804f0..31ffff3804f0 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 0390e7b86bbc..0390e7b86bbc 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 128921a67d7a..128921a67d7a 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 f65347889382..f65347889382 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 867aa0b98eca..867aa0b98eca 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 adb22f45c8e1..adb22f45c8e1 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 45e8ba4f7c02..45e8ba4f7c02 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 a1b8ece12362..a1b8ece12362 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 7813eba04361..7813eba04361 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 5eb7651f199b..5eb7651f199b 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 3c9f9c54dd39..3c9f9c54dd39 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 ac145fcd34ed..ac145fcd34ed 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 9dd923173733..9dd923173733 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 d898770fd4ef..d898770fd4ef 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 f9ca826cd620..f9ca826cd620 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 fbed4e905cfc..fbed4e905cfc 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 172e81e1369e..172e81e1369e 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 4285a6745591..4285a6745591 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 a0bd4e12063e..a0bd4e12063e 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 a486d786c374..a486d786c374 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 dcdb1053cf72..dcdb1053cf72 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 fc9280e9df5b..fc9280e9df5b 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 6e9e1596b131..6e9e1596b131 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 f3e63c537897..f3e63c537897 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 2cf6dd7eb23b..2cf6dd7eb23b 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 b23745a7b493..b23745a7b493 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 d883af1b0686..d883af1b0686 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 dcaa43156699..dcaa43156699 100644
--- a/pkgs/development/tools/devtodo/default.nix
+++ b/nixpkgs/pkgs/development/tools/devtodo/default.nix
diff --git a/pkgs/development/tools/dive/default.nix b/nixpkgs/pkgs/development/tools/dive/default.nix
index b599ccf1364a..b599ccf1364a 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 d7604f4de9d7..d7604f4de9d7 100644
--- a/pkgs/development/tools/doctl/default.nix
+++ b/nixpkgs/pkgs/development/tools/doctl/default.nix
diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/nixpkgs/pkgs/development/tools/documentation/doxygen/default.nix
index d7dcb4259633..d7dcb4259633 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 2f29fb2fbad2..2f29fb2fbad2 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/0001-highlight-fix-permission-on-file-style.patch b/nixpkgs/pkgs/development/tools/documentation/gtk-doc/0001-highlight-fix-permission-on-file-style.patch
index f7e37a1a5e5a..f7e37a1a5e5a 100644
--- a/pkgs/development/tools/documentation/gtk-doc/0001-highlight-fix-permission-on-file-style.patch
+++ b/nixpkgs/pkgs/development/tools/documentation/gtk-doc/0001-highlight-fix-permission-on-file-style.patch
diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix
index 44b5384106ea..44b5384106ea 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 95f6879a0069..95f6879a0069 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 645cd62c3c43..645cd62c3c43 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 5f3dff95e358..5f3dff95e358 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 17aa94ebf366..17aa94ebf366 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 a97526f85381..a97526f85381 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 c223a8dc54a1..c223a8dc54a1 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 14d07a0108fa..14d07a0108fa 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 0429d8876b29..0429d8876b29 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 f860fe5075d4..f860fe5075d4 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 52c82545bf36..52c82545bf36 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 19ee4c6391bf..19ee4c6391bf 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 b0c7defc5d78..b0c7defc5d78 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 70c61be984c6..70c61be984c6 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 597e66f9b293..597e66f9b293 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 ba97587c5af7..ba97587c5af7 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/default.nix b/nixpkgs/pkgs/development/tools/electron/default.nix
index fca9bc866fac..fca9bc866fac 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 203e5a4dfec6..203e5a4dfec6 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 e67b417226f4..e67b417226f4 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/hex2nix/default.nix b/nixpkgs/pkgs/development/tools/erlang/hex2nix/default.nix
index 5a24c3c95256..5a24c3c95256 100644
--- a/pkgs/development/tools/erlang/hex2nix/default.nix
+++ b/nixpkgs/pkgs/development/tools/erlang/hex2nix/default.nix
diff --git a/pkgs/development/tools/erlang/relx-exe/default.nix b/nixpkgs/pkgs/development/tools/erlang/relx-exe/default.nix
index 78735d8f76fc..78735d8f76fc 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 1ce49a4cbb9d..1ce49a4cbb9d 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 8470c9e12aa6..8470c9e12aa6 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 18367d14f6e5..18367d14f6e5 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 65335497e5ff..65335497e5ff 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 24eba03946ac..24eba03946ac 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 5548b20de83c..5548b20de83c 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 1831337a5851..1831337a5851 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 a351c325ea24..a351c325ea24 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 7eb057654283..7eb057654283 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 6b82e623a02c..6b82e623a02c 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 96212a30fcf8..96212a30fcf8 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 0e259aebd8a5..0e259aebd8a5 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 ac145fae7efe..ac145fae7efe 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 1baddb52259c..1baddb52259c 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 4ad04ae0e43b..4ad04ae0e43b 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 11880213bada..11880213bada 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 292c0dc3a4e8..292c0dc3a4e8 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 fac1a3958d37..fac1a3958d37 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 0857a3d4a7c6..0857a3d4a7c6 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 c750b5537913..c750b5537913 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 35328fdf66cf..35328fdf66cf 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 62a3df65e3aa..62a3df65e3aa 100644
--- a/pkgs/development/tools/gdm/deps.nix
+++ b/nixpkgs/pkgs/development/tools/gdm/deps.nix
diff --git a/pkgs/development/tools/geckodriver/default.nix b/nixpkgs/pkgs/development/tools/geckodriver/default.nix
index 17560f55ec4a..17560f55ec4a 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 4c258d6154ba..4c258d6154ba 100644
--- a/pkgs/development/tools/ghp-import/default.nix
+++ b/nixpkgs/pkgs/development/tools/ghp-import/default.nix
diff --git a/pkgs/development/tools/git-ftp/default.nix b/nixpkgs/pkgs/development/tools/git-ftp/default.nix
index 2d61b27e2c2c..2d61b27e2c2c 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 3408b960889d..3408b960889d 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 6acb628a322c..6acb628a322c 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 442ae4d15ec9..442ae4d15ec9 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 5db8cdb73488..5db8cdb73488 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 b1b955cba940..b1b955cba940 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 02de300138d2..02de300138d2 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 3382557aaa57..3382557aaa57 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/cligh/default.nix b/nixpkgs/pkgs/development/tools/github/cligh/default.nix
index 6a336b7015a0..6a336b7015a0 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 be268fa6de3c..be268fa6de3c 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 bd83a63e5d66..bd83a63e5d66 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 b581e71129ca..b581e71129ca 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 361740def118..361740def118 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 35f7a2bfdea1..35f7a2bfdea1 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 b7392d757cfc..b7392d757cfc 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 d85060add5eb..d85060add5eb 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 70b426dc5942..70b426dc5942 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 15042353b1d5..15042353b1d5 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 249fc21cdfe4..249fc21cdfe4 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 9a783deecee6..9a783deecee6 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 5e1a69a16929..5e1a69a16929 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 ec0e565eabd6..ec0e565eabd6 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 62e276f2f423..62e276f2f423 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 4df506f908fc..4df506f908fc 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 6a333b58bec6..6a333b58bec6 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 e64d61478e66..e64d61478e66 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 52cd37f98850..52cd37f98850 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 2554b3cad1a5..2554b3cad1a5 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 dfeb6d52e727..dfeb6d52e727 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 6a333b58bec6..6a333b58bec6 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 b55a38d27484..b55a38d27484 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 36634423fdbc..36634423fdbc 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 8fc784f4b7f8..8fc784f4b7f8 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 53d4bfaa483e..53d4bfaa483e 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 bfe862a4006a..bfe862a4006a 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 f93bd9d28c81..f93bd9d28c81 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 ac9662697063..ac9662697063 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 3351c0e986b3..3351c0e986b3 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 ac9662697063..ac9662697063 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 9ef94ffdc7fa..9ef94ffdc7fa 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 fcdb56460e19..fcdb56460e19 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 d329359da709..d329359da709 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 91ebaff803eb..91ebaff803eb 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 993305bd98fa..993305bd98fa 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 7fd6fe623748..7fd6fe623748 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 96a8464b5668..96a8464b5668 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 409baaa6f266..409baaa6f266 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/gogetdoc/default.nix b/nixpkgs/pkgs/development/tools/gogetdoc/default.nix
index 7724ee49465c..7724ee49465c 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 d770057d1d78..d770057d1d78 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 f08705989563..f08705989563 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 9d404546d008..9d404546d008 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 e26400989338..e26400989338 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 f63d33138fc2..f63d33138fc2 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 112e1769f212..112e1769f212 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 ba4f4bb3f519..ba4f4bb3f519 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 89a1da772701..89a1da772701 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 715c7bbbc824..715c7bbbc824 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 7ee87b8f8483..7ee87b8f8483 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 80a77e7fb807..80a77e7fb807 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 b8230561fb42..b8230561fb42 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 8eb65281b3fe..8eb65281b3fe 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 df411303d944..df411303d944 100644
--- a/pkgs/development/tools/gotests/deps.nix
+++ b/nixpkgs/pkgs/development/tools/gotests/deps.nix
diff --git a/pkgs/development/tools/gotools/default.nix b/nixpkgs/pkgs/development/tools/gotools/default.nix
index d83f0ec40149..d83f0ec40149 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 2030c8ba444a..2030c8ba444a 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 152b619966c9..152b619966c9 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 b28bf24892c2..b28bf24892c2 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 c4991e38ff02..c4991e38ff02 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 461110b63d71..461110b63d71 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 c86c2e275ed1..c86c2e275ed1 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 ebe76197ef4e..ebe76197ef4e 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 effc255d877e..effc255d877e 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 833b41ae985b..833b41ae985b 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 78f2e967123b..78f2e967123b 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 fd9347a4007f..fd9347a4007f 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 3b52c262c0c6..3b52c262c0c6 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 47a9c550fa8b..47a9c550fa8b 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 0f42a5e34903..0f42a5e34903 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 db467f8dd29b..db467f8dd29b 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 5e372b4f3874..5e372b4f3874 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 3b4a6406f703..3b4a6406f703 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 1eb8bf75cdfb..1eb8bf75cdfb 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 fd05e12b4d55..fd05e12b4d55 100644
--- a/pkgs/development/tools/hcloud/default.nix
+++ b/nixpkgs/pkgs/development/tools/hcloud/default.nix
diff --git a/pkgs/development/tools/hcloud/deps.nix b/nixpkgs/pkgs/development/tools/hcloud/deps.nix
index b0b544701283..b0b544701283 100644
--- a/pkgs/development/tools/hcloud/deps.nix
+++ b/nixpkgs/pkgs/development/tools/hcloud/deps.nix
diff --git a/pkgs/development/tools/heroku/default.nix b/nixpkgs/pkgs/development/tools/heroku/default.nix
index 670307402908..670307402908 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 905580482d45..905580482d45 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 b2c764c5a856..b2c764c5a856 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 34b9e1df1906..34b9e1df1906 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 c287e40d823a..c287e40d823a 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 3a39d0ddf6bd..3a39d0ddf6bd 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 e2aebe9b2dc2..e2aebe9b2dc2 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 62f33a2d2517..62f33a2d2517 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 69bbf8afe5ac..69bbf8afe5ac 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 3477aaed6075..3477aaed6075 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 10e5c61025ab..10e5c61025ab 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 274ced0b37cd..274ced0b37cd 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 6810950878be..6810950878be 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 b6a78071bc87..b6a78071bc87 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 aa47ed1186c6..aa47ed1186c6 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 403bfeabfd05..403bfeabfd05 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 4577de0cde4c..4577de0cde4c 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 9682ceb93c75..9682ceb93c75 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 27c230a9829a..27c230a9829a 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 3affa961bef1..3affa961bef1 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 981c9c1d0604..981c9c1d0604 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 0a8ea5f9a507..0a8ea5f9a507 100644
--- a/pkgs/development/tools/jazzy/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/jazzy/gemset.nix
diff --git a/pkgs/development/tools/jazzy/update b/nixpkgs/pkgs/development/tools/jazzy/update
index ff0e16868366..ff0e16868366 100755
--- a/pkgs/development/tools/jazzy/update
+++ b/nixpkgs/pkgs/development/tools/jazzy/update
diff --git a/pkgs/development/tools/jbake/default.nix b/nixpkgs/pkgs/development/tools/jbake/default.nix
index dbda476171ab..dbda476171ab 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 3fe55de2ec8c..3fe55de2ec8c 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 4833755b3ee3..4833755b3ee3 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 a027902d2df2..a027902d2df2 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 8722d49eb32e..8722d49eb32e 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 0d9ce143a834..0d9ce143a834 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 c53d6608efd3..c53d6608efd3 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 2417f4cbfd1d..2417f4cbfd1d 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 e8e8acd6a9a4..e8e8acd6a9a4 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 ebb875c92984..ebb875c92984 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 483fc40ff799..483fc40ff799 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 2a95d72c9465..2a95d72c9465 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 ef89517966d7..ef89517966d7 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 493cc42f4f4e..493cc42f4f4e 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 694428f55a6b..694428f55a6b 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 bb9df28ad87f..bb9df28ad87f 100644
--- a/pkgs/development/tools/json2hcl/deps.nix
+++ b/nixpkgs/pkgs/development/tools/json2hcl/deps.nix
diff --git a/pkgs/development/tools/just/default.nix b/nixpkgs/pkgs/development/tools/just/default.nix
index 447cc51ac39b..447cc51ac39b 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 b8071bf1ac26..b8071bf1ac26 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 4a837bcef652..4a837bcef652 100644
--- a/pkgs/development/tools/kafkacat/default.nix
+++ b/nixpkgs/pkgs/development/tools/kafkacat/default.nix
diff --git a/pkgs/development/tools/kexpand/default.nix b/nixpkgs/pkgs/development/tools/kexpand/default.nix
index a82c21b72e9e..a82c21b72e9e 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 c049d9683cce..c049d9683cce 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 3a2040e712a9..3a2040e712a9 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 1681fe9e2eb4..1681fe9e2eb4 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 0bfe54508b81..0bfe54508b81 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 af5c0e9c2f9f..af5c0e9c2f9f 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 20a26824e5e7..20a26824e5e7 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 e2391789a41c..e2391789a41c 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 0f9fb36a3f4e..0f9fb36a3f4e 100644
--- a/pkgs/development/tools/kubectx/default.nix
+++ b/nixpkgs/pkgs/development/tools/kubectx/default.nix
diff --git a/pkgs/development/tools/kubicorn/default.nix b/nixpkgs/pkgs/development/tools/kubicorn/default.nix
index a63de5507479..a63de5507479 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 17147ef7c973..17147ef7c973 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 c2bba7b32542..c2bba7b32542 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 1691f09e6e41..1691f09e6e41 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 f91938fb62e3..f91938fb62e3 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 be964cf4d308..be964cf4d308 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 afaf42779b3e..afaf42779b3e 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 58f50dd2f7e3..58f50dd2f7e3 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 e5729707d8ab..e5729707d8ab 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 a80b638625e5..a80b638625e5 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 a91ab763beaf..a91ab763beaf 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 035374d3e900..035374d3e900 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 17a7731896ee..17a7731896ee 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 66b44d1fc835..66b44d1fc835 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 44df2b1e1534..44df2b1e1534 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 3230924990b8..3230924990b8 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 00397978054b..00397978054b 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 404f3758ced4..404f3758ced4 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 7e5cbaddd8b3..7e5cbaddd8b3 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 afe5e50e47bd..afe5e50e47bd 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 a5dd0a882728..a5dd0a882728 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 e99a597b0783..e99a597b0783 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 cd80a5ad9e6f..cd80a5ad9e6f 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 27f0063e24be..27f0063e24be 100644
--- a/pkgs/development/tools/mdk/default.nix
+++ b/nixpkgs/pkgs/development/tools/mdk/default.nix
diff --git a/pkgs/development/tools/minizinc/default.nix b/nixpkgs/pkgs/development/tools/minizinc/default.nix
index 14f42ed9d40a..14f42ed9d40a 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 48a29901ca35..48a29901ca35 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 db0e41d27ab3..db0e41d27ab3 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 047cd466baac..047cd466baac 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/arcanist/default.nix b/nixpkgs/pkgs/development/tools/misc/arcanist/default.nix
index 7810ba6349ce..7810ba6349ce 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/astyle/default.nix b/nixpkgs/pkgs/development/tools/misc/astyle/default.nix
index e66d92e34d65..e66d92e34d65 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 8f425a929590..8f425a929590 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 d7cea5c3d4ed..d7cea5c3d4ed 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 9e777e53cf62..9e777e53cf62 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 98b55e31f60b..98b55e31f60b 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 304b4fddf0d5..304b4fddf0d5 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 ff5ce659d2e1..ff5ce659d2e1 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 a5aa44abcdef..a5aa44abcdef 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 e1aeb025c30f..e1aeb025c30f 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 1e432a6e149b..1e432a6e149b 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 e54a2acca67e..e54a2acca67e 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 fb2d08de6d81..fb2d08de6d81 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 2ffa91f24eda..2ffa91f24eda 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/setup-hook.sh b/nixpkgs/pkgs/development/tools/misc/automake/setup-hook.sh
index 292632b7cbce..292632b7cbce 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 c2bf7e0a831c..c2bf7e0a831c 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/avarice/default.nix b/nixpkgs/pkgs/development/tools/misc/avarice/default.nix
index a8f6426a3b7b..a8f6426a3b7b 100644
--- a/pkgs/development/tools/misc/avarice/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/avarice/default.nix
diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/nixpkgs/pkgs/development/tools/misc/avrdude/default.nix
index 39f98ae00284..39f98ae00284 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 38d2194dab82..38d2194dab82 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 cb00111b2b46..cb00111b2b46 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 16182d26db3f..16182d26db3f 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 ac7eb557f2ed..ac7eb557f2ed 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 5a047b0f0703..5a047b0f0703 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 ca50d9a57cd1..ca50d9a57cd1 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 866d6db8ce24..866d6db8ce24 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 2e9956e6b6e4..2e9956e6b6e4 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 d3cd0d2131cc..d3cd0d2131cc 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 c33741740adc..c33741740adc 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 736e0aca6ce1..736e0aca6ce1 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 abbfa73da05d..abbfa73da05d 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 0fb05a482d1c..0fb05a482d1c 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 9624b7976b70..9624b7976b70 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 74e56d130ed5..74e56d130ed5 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 281463528354..281463528354 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 b4c7558885bb..b4c7558885bb 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 f0b915de540a..f0b915de540a 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 4284245f485d..4284245f485d 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 0d78cfbbab8c..0d78cfbbab8c 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 359ab125be99..359ab125be99 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 cc42f0745da5..cc42f0745da5 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 6519f349bfc8..6519f349bfc8 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 c5cb277c256f..c5cb277c256f 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 98a6fbf10bf1..98a6fbf10bf1 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 7b233df6531b..7b233df6531b 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 f643ecab69d6..f643ecab69d6 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 f8d7b9eb3fea..f8d7b9eb3fea 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 ed4886305e3c..ed4886305e3c 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 31e720b13f29..31e720b13f29 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 5f98df54c0a0..5f98df54c0a0 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 4170570e08aa..4170570e08aa 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 ed96befca5e7..ed96befca5e7 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 6a4ef8b73497..6a4ef8b73497 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 daf39318432a..daf39318432a 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 c245a32a06d9..c245a32a06d9 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 ff7ee9446d28..ff7ee9446d28 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 904119bd6ae3..904119bd6ae3 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/coccinelle/default.nix b/nixpkgs/pkgs/development/tools/misc/coccinelle/default.nix
index 4040eda141fd..4040eda141fd 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 d95c67fea6d9..d95c67fea6d9 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 e4d123dece1d..e4d123dece1d 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 3743fef977b0..3743fef977b0 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 8a0cb095d445..8a0cb095d445 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 54ad7ca7071c..54ad7ca7071c 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 534f900f94af..534f900f94af 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 1aa17bac750c..1aa17bac750c 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 67cd321cfd53..67cd321cfd53 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 eff1af8cdb47..eff1af8cdb47 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 86136084d840..86136084d840 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 869e7a61121d..869e7a61121d 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 d8deb75d2d41..d8deb75d2d41 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 b96f65c2ecc2..b96f65c2ecc2 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 a1c9e85a83ab..a1c9e85a83ab 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 96cb28e9e55a..96cb28e9e55a 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 c51a5f504741..c51a5f504741 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 c4e4004b12e0..c4e4004b12e0 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 693c791875be..693c791875be 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 ba95889b5a80..ba95889b5a80 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 2657e570106e..2657e570106e 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 efb850d5adef..efb850d5adef 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/distcc/default.nix b/nixpkgs/pkgs/development/tools/misc/distcc/default.nix
index 9891726c6633..9891726c6633 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 f3bccde81606..f3bccde81606 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 9975f0f5465c..9975f0f5465c 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 f9a640d47038..f9a640d47038 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-core-c/default.nix b/nixpkgs/pkgs/development/tools/misc/editorconfig-core-c/default.nix
index 2eda1f044ce8..2eda1f044ce8 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 7c7e53404343..7c7e53404343 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 51a5f52d3759..51a5f52d3759 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 905fa0d40935..905fa0d40935 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 409f1311c315..409f1311c315 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 424032e21af4..424032e21af4 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 f58d06599650..f58d06599650 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 6dd7e90f8f77..6dd7e90f8f77 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 e84aa0ef555a..e84aa0ef555a 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 73de8eb8cb61..73de8eb8cb61 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 1328d919503a..1328d919503a 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 a7eda2c7e173..a7eda2c7e173 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 e37824d241cc..e37824d241cc 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 b021a3e222b3..b021a3e222b3 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 70a157bc0840..70a157bc0840 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 b6758cb0bc2a..b6758cb0bc2a 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 b2c71388fc52..b2c71388fc52 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 b14d8be6ef16..b14d8be6ef16 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 afe9b59e012d..afe9b59e012d 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 a009a4ba4465..a009a4ba4465 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 b1e107368ba7..b1e107368ba7 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 4a8b2e8daaba..4a8b2e8daaba 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 cd0854d2beb8..cd0854d2beb8 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 942d726d76ea..942d726d76ea 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 25043f89463d..25043f89463d 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 aaaee20b81a8..aaaee20b81a8 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 02b4d1557678..02b4d1557678 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 3d00a03e9a58..3d00a03e9a58 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 5280b69cdcec..5280b69cdcec 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 82f8cf1cb37b..82f8cf1cb37b 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 264f2aec44d4..264f2aec44d4 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 f1875ee0903a..f1875ee0903a 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 fe51488c7066..fe51488c7066 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/default.nix b/nixpkgs/pkgs/development/tools/misc/hydra/default.nix
index 0d50c772bdee..0d50c772bdee 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 d7b2cd36492e..d7b2cd36492e 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 294d1fa10dde..294d1fa10dde 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 5458a0d93bff..5458a0d93bff 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 c4b5fecca741..c4b5fecca741 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 8bc35ba01a61..8bc35ba01a61 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 281b09393b5d..281b09393b5d 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 a9f451d31e7d..a9f451d31e7d 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 1d5da65df7e0..1d5da65df7e0 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 9368a3c1acf8..9368a3c1acf8 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 af660561ee17..af660561ee17 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 b49594964e1f..b49594964e1f 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 e33259b416fa..e33259b416fa 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 b431e804d8dc..b431e804d8dc 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/5.x.nix b/nixpkgs/pkgs/development/tools/misc/kibana/5.x.nix
index 782bff68e349..782bff68e349 100644
--- a/pkgs/development/tools/misc/kibana/5.x.nix
+++ b/nixpkgs/pkgs/development/tools/misc/kibana/5.x.nix
diff --git a/pkgs/development/tools/misc/kibana/6.x.nix b/nixpkgs/pkgs/development/tools/misc/kibana/6.x.nix
index 0d052f340958..0d052f340958 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 e8435549f4aa..e8435549f4aa 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.patch b/nixpkgs/pkgs/development/tools/misc/kibana/disable-nodejs-version-check.patch
index 12a81566a72c..12a81566a72c 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 f56a59c42704..f56a59c42704 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 0fb3dfed7445..0fb3dfed7445 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 c751c2755587..c751c2755587 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 27f49ebcf38c..27f49ebcf38c 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 c4164b414331..c4164b414331 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 240d52ca7d0e..240d52ca7d0e 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/darwin-dfile.patch b/nixpkgs/pkgs/development/tools/misc/lsof/darwin-dfile.patch
index 9952228e613a..9952228e613a 100644
--- a/pkgs/development/tools/misc/lsof/darwin-dfile.patch
+++ b/nixpkgs/pkgs/development/tools/misc/lsof/darwin-dfile.patch
diff --git a/pkgs/development/tools/misc/lsof/default.nix b/nixpkgs/pkgs/development/tools/misc/lsof/default.nix
index 63003f338eb9..63003f338eb9 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 cf785e248f2a..cf785e248f2a 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 77d4c5771f90..77d4c5771f90 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 42ca1a1b7d54..42ca1a1b7d54 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 adc4bbd5c39a..adc4bbd5c39a 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 36a89726e81c..36a89726e81c 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.0.x.patch b/nixpkgs/pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch
index a5e4ac461b48..a5e4ac461b48 100644
--- a/pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch
+++ b/nixpkgs/pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch
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 7ef1c7a319ca..7ef1c7a319ca 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 2e0eec5ae57d..2e0eec5ae57d 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 e69de1fe8895..e69de1fe8895 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 8da224f0ef8c..8da224f0ef8c 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 587d5413c3ed..587d5413c3ed 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 ebe62452440e..ebe62452440e 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 23b7119e7d74..23b7119e7d74 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/.bundle/config b/nixpkgs/pkgs/development/tools/misc/mdl/.bundle/config
index d28c8337bc45..d28c8337bc45 100644
--- a/pkgs/development/tools/misc/mdl/.bundle/config
+++ b/nixpkgs/pkgs/development/tools/misc/mdl/.bundle/config
diff --git a/pkgs/development/tools/misc/mdl/Gemfile b/nixpkgs/pkgs/development/tools/misc/mdl/Gemfile
index 15b33c53a653..15b33c53a653 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 aabcd784d867..aabcd784d867 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 f0aca5c36a15..f0aca5c36a15 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 6d48be1cbcb0..6d48be1cbcb0 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/mkcert/default.nix b/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix
index 9532b6e34421..9532b6e34421 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 c45e7841d450..c45e7841d450 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 5c2b0ad0ee33..5c2b0ad0ee33 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 af3b45a8e62c..af3b45a8e62c 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 ade9954021a1..ade9954021a1 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 0a6155e649e5..0a6155e649e5 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 a449c28ea289..a449c28ea289 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 bf4378d58ce2..bf4378d58ce2 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 3e02f085ae6b..3e02f085ae6b 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 cf4a719292c4..cf4a719292c4 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 485ddf940fda..485ddf940fda 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 874aa04157dc..874aa04157dc 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 7141fdcee7e7..7141fdcee7e7 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 5b17f111b45a..5b17f111b45a 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 77d03f299f4a..77d03f299f4a 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 bc1cddd4879c..bc1cddd4879c 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 29d713a9af44..29d713a9af44 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 c1dd808e6008..c1dd808e6008 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 13855eb4e742..13855eb4e742 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 d40aa9801379..d40aa9801379 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 34a9b9f1173b..34a9b9f1173b 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 43d86966694f..43d86966694f 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 fbb21a8b7c65..fbb21a8b7c65 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 534d6c1d6ef7..534d6c1d6ef7 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 f99c904ed01c..f99c904ed01c 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 a94614af7967..a94614af7967 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 8ceb3d4a4367..8ceb3d4a4367 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 99bf8cac81fa..99bf8cac81fa 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 ba06ea2c7617..ba06ea2c7617 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 8f27609ababe..8f27609ababe 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 65a7c9eef397..65a7c9eef397 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 8093846780d2..8093846780d2 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 1e85e87c5378..1e85e87c5378 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 19e4423f7d86..19e4423f7d86 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 b4451e4d99f7..b4451e4d99f7 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/sccache/default.nix b/nixpkgs/pkgs/development/tools/misc/sccache/default.nix
index 0d2e813071e6..0d2e813071e6 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 879346a2b796..879346a2b796 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 a506831cd8ea..a506831cd8ea 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 965f0ed096cd..965f0ed096cd 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 a077367622eb..a077367622eb 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 a76a180741ef..a76a180741ef 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 90f901e51125..90f901e51125 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/stm32flash/default.nix b/nixpkgs/pkgs/development/tools/misc/stm32flash/default.nix
index 553ded815ef8..553ded815ef8 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 49b12b60b146..49b12b60b146 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 80cfdc8b196d..80cfdc8b196d 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 262afe4f1891..262afe4f1891 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/default.nix b/nixpkgs/pkgs/development/tools/misc/swig/default.nix
index e74b2898498c..e74b2898498c 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 7b6048eb475d..7b6048eb475d 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 b50aa088ac57..b50aa088ac57 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 82d0ec6119ea..82d0ec6119ea 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/tet/default.nix b/nixpkgs/pkgs/development/tools/misc/tet/default.nix
index 77b362c712c2..77b362c712c2 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 b094f05e9516..b094f05e9516 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 63e5bea19d74..63e5bea19d74 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 d395494984d5..d395494984d5 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 34596f306581..34596f306581 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 613fd2673d56..613fd2673d56 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/perl.patch b/nixpkgs/pkgs/development/tools/misc/texinfo/perl.patch
index e651b37371c7..e651b37371c7 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/tie/default.nix b/nixpkgs/pkgs/development/tools/misc/tie/default.nix
index c380243a898b..c380243a898b 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/tokei/default.nix b/nixpkgs/pkgs/development/tools/misc/tokei/default.nix
index f77e30b45ae9..f77e30b45ae9 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 0a470854aaf5..0a470854aaf5 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 c5ac09cb9e6a..c5ac09cb9e6a 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 b5c5740e80ff..b5c5740e80ff 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 09d5d41454e5..09d5d41454e5 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 ddcf493bb468..ddcf493bb468 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 11caf8e7b20e..11caf8e7b20e 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 1727f772006e..1727f772006e 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 d85cd1a82164..d85cd1a82164 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 8fc268423505..8fc268423505 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 57de59605f30..57de59605f30 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 7c44d699d79a..7c44d699d79a 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/data.nix b/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/data.nix
index 0fa854f9b2a1..0fa854f9b2a1 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 d34a94e04670..d34a94e04670 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 e806a7796386..e806a7796386 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 fc739389e84e..fc739389e84e 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 fa157d794f73..fa157d794f73 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 32f94a1f2285..32f94a1f2285 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 a3bb144899c7..a3bb144899c7 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 0c6e4f568ffc..0c6e4f568ffc 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/xc3sprog/default.nix b/nixpkgs/pkgs/development/tools/misc/xc3sprog/default.nix
index 8f3f6c1b22a7..8f3f6c1b22a7 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 51f4de8eacce..51f4de8eacce 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/xxdiff/tip.nix b/nixpkgs/pkgs/development/tools/misc/xxdiff/tip.nix
index 1424b8fe1974..1424b8fe1974 100644
--- a/pkgs/development/tools/misc/xxdiff/tip.nix
+++ b/nixpkgs/pkgs/development/tools/misc/xxdiff/tip.nix
diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix
index 2e67da18ae9a..2e67da18ae9a 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 76130f255fde..76130f255fde 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 6390c1d7fd24..6390c1d7fd24 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 47beb1a22418..47beb1a22418 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 42190e655778..42190e655778 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 b44e52aa2bf5..b44e52aa2bf5 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 2b5f42b2cbe5..2b5f42b2cbe5 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 0b060624de3d..0b060624de3d 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 07005131fb5e..07005131fb5e 100644
--- a/pkgs/development/tools/nailgun/default.nix
+++ b/nixpkgs/pkgs/development/tools/nailgun/default.nix
diff --git a/pkgs/development/tools/neoload/default.nix b/nixpkgs/pkgs/development/tools/neoload/default.nix
index 06945f10eb23..06945f10eb23 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 099e31b8d62d..099e31b8d62d 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 234f5a5bfae7..234f5a5bfae7 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 7117d7dd628f..7117d7dd628f 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 211934080c8f..211934080c8f 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 7c7bf79acc7d..7c7bf79acc7d 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 2974ca965fdc..2974ca965fdc 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 efd6e562c29a..efd6e562c29a 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 159260750a25..159260750a25 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/dune/default.nix b/nixpkgs/pkgs/development/tools/ocaml/dune/default.nix
index 268890360b69..268890360b69 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 18b84e2c961d..18b84e2c961d 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 7cd32991d0eb..7cd32991d0eb 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 7718cb673925..7718cb673925 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 1307635abb99..1307635abb99 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 e6fc96038ff8..e6fc96038ff8 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 ff59fa7cf8a3..ff59fa7cf8a3 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 c5a345f505b7..c5a345f505b7 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 f88811855a2e..f88811855a2e 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 e7a31c1ce2e5..e7a31c1ce2e5 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 bf33b4e59e52..bf33b4e59e52 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 0649aee162a5..0649aee162a5 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 ddea73b3c766..ddea73b3c766 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 1ba9ddd0ab7f..1ba9ddd0ab7f 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 3b176541f517..3b176541f517 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 2364058729e8..2364058729e8 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 87d592bd1126..87d592bd1126 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 41cde6f8ab73..41cde6f8ab73 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 7336439240d5..7336439240d5 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 ec9ff6f4ba90..ec9ff6f4ba90 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 694f4b6e89a0..694f4b6e89a0 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 df480903d154..df480903d154 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 74dee630d295..74dee630d295 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 4fc887c070d7..4fc887c070d7 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 28efaf4cf3d2..28efaf4cf3d2 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 0ed7312660a1..0ed7312660a1 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 7ecc15da2b50..7ecc15da2b50 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 79be6a8170ca..79be6a8170ca 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 f91ae7132005..f91ae7132005 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 182250f9a744..182250f9a744 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 0f536c489eb6..0f536c489eb6 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 4459e89d7f9c..4459e89d7f9c 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 fa5393c1871c..fa5393c1871c 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 ddd8d4b9920b..ddd8d4b9920b 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 f844b369eb32..f844b369eb32 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 f74ac84ca6b2..f74ac84ca6b2 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 59a1cd223b5d..59a1cd223b5d 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 d9e563952ea7..d9e563952ea7 100644
--- a/pkgs/development/tools/ocaml/utop/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix
diff --git a/pkgs/development/tools/omniorb/default.nix b/nixpkgs/pkgs/development/tools/omniorb/default.nix
index 725219c3d7c7..725219c3d7c7 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 85f8955185fb..85f8955185fb 100644
--- a/pkgs/development/tools/omnisharp-roslyn/default.nix
+++ b/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix
diff --git a/pkgs/development/tools/packer/default.nix b/nixpkgs/pkgs/development/tools/packer/default.nix
index 24a6404dc039..24a6404dc039 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 82849be40b2c..82849be40b2c 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 53a9bef73207..53a9bef73207 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 6f96b81e7a46..6f96b81e7a46 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 616a2049c778..616a2049c778 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 a71b7718e3bf..a71b7718e3bf 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 a054bc82d45d..a054bc82d45d 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 b53116b888e1..b53116b888e1 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 4c213ed1c4c2..4c213ed1c4c2 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 e6e54f8dab92..e6e54f8dab92 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 b8e7791b6fc9..b8e7791b6fc9 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/2.x.nix b/nixpkgs/pkgs/development/tools/parsing/bison/2.x.nix
index e9aa33d2f60b..e9aa33d2f60b 100644
--- a/pkgs/development/tools/parsing/bison/2.x.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/bison/2.x.nix
diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/nixpkgs/pkgs/development/tools/parsing/bison/3.x.nix
index bbcecae8f04f..bbcecae8f04f 100644
--- a/pkgs/development/tools/parsing/bison/3.x.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/bison/3.x.nix
diff --git a/pkgs/development/tools/parsing/bison/darwin-vasnprintf.patch b/nixpkgs/pkgs/development/tools/parsing/bison/darwin-vasnprintf.patch
index 84b0e6d39d87..84b0e6d39d87 100644
--- a/pkgs/development/tools/parsing/bison/darwin-vasnprintf.patch
+++ b/nixpkgs/pkgs/development/tools/parsing/bison/darwin-vasnprintf.patch
diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix
index 4e73c820912b..4e73c820912b 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 7e09b0a8cd38..7e09b0a8cd38 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 3a46c6c8f01e..3a46c6c8f01e 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 d7d27ac9a1cd..d7d27ac9a1cd 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 681f90bbe5a6..681f90bbe5a6 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 bf5a2374fdef..bf5a2374fdef 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 6f0eb3735ffb..6f0eb3735ffb 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 359daad2d517..359daad2d517 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 108576d0b11c..108576d0b11c 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 5b8b16ef1922..5b8b16ef1922 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 d08df8265b0a..d08df8265b0a 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 1d0545f6889e..1d0545f6889e 100644
--- a/pkgs/development/tools/parsing/re2c/default.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/re2c/default.nix
diff --git a/pkgs/development/tools/pax-rs/default.nix b/nixpkgs/pkgs/development/tools/pax-rs/default.nix
index ee6a7ec78c20..ee6a7ec78c20 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 ce562bbf5ac5..ce562bbf5ac5 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 6f26a48b9c43..6f26a48b9c43 100644
--- a/pkgs/development/tools/pew/default.nix
+++ b/nixpkgs/pkgs/development/tools/pew/default.nix
diff --git a/pkgs/development/tools/pgloader/default.nix b/nixpkgs/pkgs/development/tools/pgloader/default.nix
index 47b426604da0..47b426604da0 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 2c37d71e75ce..2c37d71e75ce 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 a37de2a3f628..a37de2a3f628 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 743372b0f0bc..743372b0f0bc 100644
--- a/pkgs/development/tools/phantomjs2/system-qtbase.patch
+++ b/nixpkgs/pkgs/development/tools/phantomjs2/system-qtbase.patch
diff --git a/pkgs/development/tools/pipenv/default.nix b/nixpkgs/pkgs/development/tools/pipenv/default.nix
index cb8e61e119d9..cb8e61e119d9 100644
--- a/pkgs/development/tools/pipenv/default.nix
+++ b/nixpkgs/pkgs/development/tools/pipenv/default.nix
diff --git a/pkgs/development/tools/postiats-utilities/default.nix b/nixpkgs/pkgs/development/tools/postiats-utilities/default.nix
index 40cd133032fb..40cd133032fb 100644
--- a/pkgs/development/tools/postiats-utilities/default.nix
+++ b/nixpkgs/pkgs/development/tools/postiats-utilities/default.nix
diff --git a/pkgs/development/tools/profiling/EZTrace/default.nix b/nixpkgs/pkgs/development/tools/profiling/EZTrace/default.nix
index 8155f3016c3f..8155f3016c3f 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 5ff0d2ca2b1e..5ff0d2ca2b1e 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 0b2b49717645..0b2b49717645 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 9130f31f21d3..9130f31f21d3 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 e76f6367996b..e76f6367996b 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/pyflame/default.nix b/nixpkgs/pkgs/development/tools/profiling/pyflame/default.nix
index acb5d9d943cb..acb5d9d943cb 100644
--- a/pkgs/development/tools/profiling/pyflame/default.nix
+++ b/nixpkgs/pkgs/development/tools/profiling/pyflame/default.nix
diff --git a/pkgs/development/tools/profiling/pyprof2calltree/default.nix b/nixpkgs/pkgs/development/tools/profiling/pyprof2calltree/default.nix
index a2d98bcf2387..a2d98bcf2387 100644
--- a/pkgs/development/tools/profiling/pyprof2calltree/default.nix
+++ b/nixpkgs/pkgs/development/tools/profiling/pyprof2calltree/default.nix
diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix
index 720544f4b6c6..720544f4b6c6 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 6b1918a5d982..6b1918a5d982 100644
--- a/pkgs/development/tools/profiling/systemtap/default.nix
+++ b/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix
diff --git a/pkgs/development/tools/proto-contrib/default.nix b/nixpkgs/pkgs/development/tools/proto-contrib/default.nix
index 836683895565..836683895565 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 559383f45fe7..559383f45fe7 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 277944488936..277944488936 100644
--- a/pkgs/development/tools/prototool/default.nix
+++ b/nixpkgs/pkgs/development/tools/prototool/default.nix
diff --git a/pkgs/development/tools/pup/default.nix b/nixpkgs/pkgs/development/tools/pup/default.nix
index 10a10fa21efb..10a10fa21efb 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 105049819129..105049819129 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 8c5d369fb371..8c5d369fb371 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 2940605b1b08..2940605b1b08 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 86d18b0c554c..86d18b0c554c 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/pydb/default.nix b/nixpkgs/pkgs/development/tools/pydb/default.nix
index e174184835a4..e174184835a4 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 0f1482d7953d..0f1482d7953d 100644
--- a/pkgs/development/tools/pypi2nix/default.nix
+++ b/nixpkgs/pkgs/development/tools/pypi2nix/default.nix
diff --git a/pkgs/development/tools/pyre/default.nix b/nixpkgs/pkgs/development/tools/pyre/default.nix
index b5dfe3c8bfd9..b5dfe3c8bfd9 100644
--- a/pkgs/development/tools/pyre/default.nix
+++ b/nixpkgs/pkgs/development/tools/pyre/default.nix
diff --git a/pkgs/development/tools/pyre/pyre-bdist-wheel.patch b/nixpkgs/pkgs/development/tools/pyre/pyre-bdist-wheel.patch
index 1b6fea024e03..1b6fea024e03 100644
--- a/pkgs/development/tools/pyre/pyre-bdist-wheel.patch
+++ b/nixpkgs/pkgs/development/tools/pyre/pyre-bdist-wheel.patch
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 8744b753a6e6..8744b753a6e6 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/default.nix b/nixpkgs/pkgs/development/tools/qtcreator/default.nix
index 03b758cbdc6d..03b758cbdc6d 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 9292d124545a..9292d124545a 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 6c042966c23f..6c042966c23f 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 d5059aa6b93b..d5059aa6b93b 100644
--- a/pkgs/development/tools/quilt/default.nix
+++ b/nixpkgs/pkgs/development/tools/quilt/default.nix
diff --git a/pkgs/development/tools/rdocker/default.nix b/nixpkgs/pkgs/development/tools/rdocker/default.nix
index a5683e7a953d..a5683e7a953d 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 97e92c3472cc..97e92c3472cc 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 b81abe028c3c..b81abe028c3c 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 f78cb0873c08..f78cb0873c08 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 364bdb778f51..364bdb778f51 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 c83117860100..c83117860100 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 2bfaa1fb9529..2bfaa1fb9529 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 3e69b4ffa073..3e69b4ffa073 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 6ef724022e8c..6ef724022e8c 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 460fb46671ff..460fb46671ff 100644
--- a/pkgs/development/tools/remarshal/default.nix
+++ b/nixpkgs/pkgs/development/tools/remarshal/default.nix
diff --git a/pkgs/development/tools/reno/default.nix b/nixpkgs/pkgs/development/tools/reno/default.nix
index 35aab138292d..35aab138292d 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 ffd9774ee447..ffd9774ee447 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 14bcc973aae7..14bcc973aae7 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 744b4b96a56b..744b4b96a56b 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/nixpkgs/pkgs/development/tools/rhc/default.nix b/nixpkgs/pkgs/development/tools/rhc/default.nix
new file mode 100644
index 000000000000..634ca28aaf13
--- /dev/null
+++ b/nixpkgs/pkgs/development/tools/rhc/default.nix
@@ -0,0 +1,29 @@
+{ lib, bundlerEnv, ruby_2_2, stdenv, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "rhc-1.38.7";
+
+  env = bundlerEnv {
+    name = "rhc-1.38.7-gems";
+
+    ruby = ruby_2_2;
+
+    gemdir = ./.;
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    makeWrapper ${env}/bin/rhc $out/bin/rhc
+  '';
+
+  meta = with lib; {
+    homepage = https://github.com/openshift/rhc;
+    description = "OpenShift client tools";
+    license = licenses.asl20;
+    maintainers = [ maintainers.szczyp ];
+  };
+}
diff --git a/pkgs/development/tools/richgo/default.nix b/nixpkgs/pkgs/development/tools/richgo/default.nix
index aa537df15084..aa537df15084 100644
--- a/pkgs/development/tools/richgo/default.nix
+++ b/nixpkgs/pkgs/development/tools/richgo/default.nix
diff --git a/pkgs/development/tools/ronn/Gemfile b/nixpkgs/pkgs/development/tools/ronn/Gemfile
index 64f1df743abc..64f1df743abc 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 c2b90f634948..c2b90f634948 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 5f20e89d4083..5f20e89d4083 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 ce804e1f9f5b..ce804e1f9f5b 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 72b9406211cb..72b9406211cb 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 421aeb9ad91c..421aeb9ad91c 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 da3b27ebacc5..da3b27ebacc5 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 18a39cab1c3e..18a39cab1c3e 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 91fca663bf28..91fca663bf28 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 b91a36cb0613..b91a36cb0613 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 1f83bbf96b78..1f83bbf96b78 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 09008c9d63d8..09008c9d63d8 100644
--- a/pkgs/development/tools/rucksack/default.nix
+++ b/nixpkgs/pkgs/development/tools/rucksack/default.nix
diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix
index 2f23cbba6950..2f23cbba6950 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 95cd0901cec8..95cd0901cec8 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 8fb0b63727a2..8fb0b63727a2 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 20996537c32c..20996537c32c 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-expand/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix
index 32cd368fb04d..32cd368fb04d 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 f19aabae7a18..f19aabae7a18 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-inspect/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-inspect/default.nix
index ec2325fc6258..ec2325fc6258 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/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix
index 56f550e37a21..56f550e37a21 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-sweep/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-sweep/default.nix
index a6068a96dc7e..a6068a96dc7e 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-xbuild/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix
index b349fbc6bd99..b349fbc6bd99 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 bce1e273cc41..bce1e273cc41 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/pyo3-pack/default.nix b/nixpkgs/pkgs/development/tools/rust/pyo3-pack/default.nix
index a17d50262a0e..a17d50262a0e 100644
--- a/pkgs/development/tools/rust/pyo3-pack/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/pyo3-pack/default.nix
diff --git a/pkgs/development/tools/rust/racer/default.nix b/nixpkgs/pkgs/development/tools/rust/racer/default.nix
index fabd61018afe..fabd61018afe 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/racer/ignore-tests.patch b/nixpkgs/pkgs/development/tools/rust/racer/ignore-tests.patch
index 021217b4094e..021217b4094e 100644
--- a/pkgs/development/tools/rust/racer/ignore-tests.patch
+++ b/nixpkgs/pkgs/development/tools/rust/racer/ignore-tests.patch
diff --git a/pkgs/development/tools/rust/racer/rust-src.patch b/nixpkgs/pkgs/development/tools/rust/racer/rust-src.patch
index 2e794ac88874..2e794ac88874 100644
--- a/pkgs/development/tools/rust/racer/rust-src.patch
+++ b/nixpkgs/pkgs/development/tools/rust/racer/rust-src.patch
diff --git a/pkgs/development/tools/rust/racerd/default.nix b/nixpkgs/pkgs/development/tools/rust/racerd/default.nix
index ae282584aaff..ae282584aaff 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 fd5bc6978310..fd5bc6978310 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/rls/default.nix b/nixpkgs/pkgs/development/tools/rust/rls/default.nix
index f52ab0d767a3..f52ab0d767a3 100644
--- a/pkgs/development/tools/rust/rls/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/rls/default.nix
diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/nixpkgs/pkgs/development/tools/rust/rustfmt/default.nix
index b98ab0dc74d7..b98ab0dc74d7 100644
--- a/pkgs/development/tools/rust/rustfmt/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/rustfmt/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 74da8d6102e7..74da8d6102e7 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 0bf1c61c9598..0bf1c61c9598 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 5cd1f685fc11..5cd1f685fc11 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 4e7032025c3d..4e7032025c3d 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 e46ea120f725..e46ea120f725 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 1b99dd3a1361..1b99dd3a1361 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 c204ba8cd406..c204ba8cd406 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 f4fdc899abf8..f4fdc899abf8 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 07f1581e3418..07f1581e3418 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 50e2bd8dad84..50e2bd8dad84 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 bd8a013fe2d0..bd8a013fe2d0 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 0190283e7916..0190283e7916 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 05f7805a55ac..05f7805a55ac 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 909b790b81a8..909b790b81a8 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/scss-lint/Gemfile b/nixpkgs/pkgs/development/tools/scss-lint/Gemfile
index 05eac2332f5b..05eac2332f5b 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 546dfabe4d76..546dfabe4d76 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 d1d0dbababa2..d1d0dbababa2 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 46747f049396..46747f049396 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 50aad7a013a9..50aad7a013a9 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 a8085399b3db..a8085399b3db 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 82b6d7e1161a..82b6d7e1161a 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 61b74ce108d6..61b74ce108d6 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 5d1f015e8052..5d1f015e8052 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 b0d5873ed63c..b0d5873ed63c 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 f5b1399df091..f5b1399df091 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 04076a8f0cf6..04076a8f0cf6 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 d5a6f3915f2e..d5a6f3915f2e 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 6dfda2bbfe6c..6dfda2bbfe6c 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 534c69200e02..534c69200e02 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 f2d6b89e51b4..f2d6b89e51b4 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 3066d5de8293..3066d5de8293 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 35ba9f8c006b..35ba9f8c006b 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 4c5b1843229b..4c5b1843229b 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 c9df2703daa5..c9df2703daa5 100644
--- a/pkgs/development/tools/spirv-tools/default.nix
+++ b/nixpkgs/pkgs/development/tools/spirv-tools/default.nix
diff --git a/pkgs/development/tools/sqlint/Gemfile b/nixpkgs/pkgs/development/tools/sqlint/Gemfile
index 7f045baeaa01..7f045baeaa01 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 6fc638615fbf..6fc638615fbf 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 67fbd09f1027..67fbd09f1027 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 b10a56c4c923..b10a56c4c923 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 4acfa4a2b0ed..4acfa4a2b0ed 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 8683c75a696d..8683c75a696d 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 21068a8b05f6..21068a8b05f6 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 0ad7d7f78d4a..0ad7d7f78d4a 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 0429d8876b29..0429d8876b29 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 b3026cdf84d4..b3026cdf84d4 100644
--- a/pkgs/development/tools/sunxi-tools/default.nix
+++ b/nixpkgs/pkgs/development/tools/sunxi-tools/default.nix
diff --git a/pkgs/development/tools/textql/default.nix b/nixpkgs/pkgs/development/tools/textql/default.nix
index a3499258a999..a3499258a999 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 e166e73a61fc..e166e73a61fc 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 91a01edc23a6..91a01edc23a6 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 90d36c71caa9..90d36c71caa9 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 6743b25cb8ab..6743b25cb8ab 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 59a47bb989a9..59a47bb989a9 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 5b46b975cf7f..5b46b975cf7f 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 565ec7904f18..565ec7904f18 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 ef7ad9828ace..ef7ad9828ace 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 7f395174bb41..7f395174bb41 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 39cc499e2180..39cc499e2180 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 a348e295933e..a348e295933e 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 775e26eb6a8c..775e26eb6a8c 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 194aa96ae3ce..194aa96ae3ce 100644
--- a/pkgs/development/tools/tychus/deps.nix
+++ b/nixpkgs/pkgs/development/tools/tychus/deps.nix
diff --git a/pkgs/development/tools/uftrace/default.nix b/nixpkgs/pkgs/development/tools/uftrace/default.nix
index cb10a252d121..cb10a252d121 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 1e81c5b9f86e..1e81c5b9f86e 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 333ec7ca3b15..333ec7ca3b15 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 032865be7f5f..032865be7f5f 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 26a923ab0394..26a923ab0394 100644
--- a/pkgs/development/tools/unity3d/unity-nosuid.c
+++ b/nixpkgs/pkgs/development/tools/unity3d/unity-nosuid.c
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 f87ff5135b3f..f87ff5135b3f 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 7b47cf0aa089..7b47cf0aa089 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 9d98b3a48bde..9d98b3a48bde 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 2631833dc009..2631833dc009 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 7b4ce471c94d..7b4ce471c94d 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 c386acf4a1c7..c386acf4a1c7 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 22060e1c2db7..22060e1c2db7 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/valadoc/default.nix b/nixpkgs/pkgs/development/tools/valadoc/default.nix
index ebeb81c90ec5..ebeb81c90ec5 100644
--- a/pkgs/development/tools/valadoc/default.nix
+++ b/nixpkgs/pkgs/development/tools/valadoc/default.nix
diff --git a/pkgs/development/tools/vcstool/default.nix b/nixpkgs/pkgs/development/tools/vcstool/default.nix
index f6c160de65c3..f6c160de65c3 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 9601771f75f0..9601771f75f0 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 4f8506794d36..4f8506794d36 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 3e8a228bacf1..3e8a228bacf1 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 42cf6f07f4d0..42cf6f07f4d0 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 e87ba2b52c14..e87ba2b52c14 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 5acf5ed0d231..5acf5ed0d231 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 8e17c531547d..8e17c531547d 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 e9ced0e753a0..e9ced0e753a0 100644
--- a/pkgs/development/tools/wabt/default.nix
+++ b/nixpkgs/pkgs/development/tools/wabt/default.nix
diff --git a/pkgs/development/tools/wasm-pack/default.nix b/nixpkgs/pkgs/development/tools/wasm-pack/default.nix
index 5827844c1b58..5827844c1b58 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 b349ecf61e13..b349ecf61e13 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 df32d68767fb..df32d68767fb 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 aaf1b20ea6f7..aaf1b20ea6f7 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 e0c897499d2a..e0c897499d2a 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 18d7be93258b..18d7be93258b 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 c6c001143a95..c6c001143a95 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 17c64f0548b3..17c64f0548b3 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 82988437145f..82988437145f 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 29325fad7243..29325fad7243 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 e20dc878b535..e20dc878b535 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 5ff3ca6808dc..5ff3ca6808dc 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 9dc03a61f62e..9dc03a61f62e 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 e435f0978c5e..e435f0978c5e 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 cd7b86163667..cd7b86163667 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 0b37143fe0eb..0b37143fe0eb 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 6f1ba7545a82..6f1ba7545a82 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 99af752086f6..99af752086f6 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 30c68a93c13f..30c68a93c13f 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 4d62f5b85714..4d62f5b85714 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 c163c4cbcf69..c163c4cbcf69 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 1a8d7f13aff5..1a8d7f13aff5 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 f907520cc872..f907520cc872 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 b5263673faad..b5263673faad 100644
--- a/pkgs/development/tools/yarn/default.nix
+++ b/nixpkgs/pkgs/development/tools/yarn/default.nix
diff --git a/pkgs/development/tools/ydiff/default.nix b/nixpkgs/pkgs/development/tools/ydiff/default.nix
index c2f72138db5f..c2f72138db5f 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 3520bcfc1b12..3520bcfc1b12 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 0bfe7f5f5da3..0bfe7f5f5da3 100644
--- a/pkgs/development/tools/yj/deps.nix
+++ b/nixpkgs/pkgs/development/tools/yj/deps.nix
diff --git a/pkgs/development/tools/yq/default.nix b/nixpkgs/pkgs/development/tools/yq/default.nix
index f93a24d56f9c..f93a24d56f9c 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 c157ddd65a87..c157ddd65a87 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 4159e3690490..4159e3690490 100644
--- a/pkgs/development/web/csslint/default.nix
+++ b/nixpkgs/pkgs/development/web/csslint/default.nix
diff --git a/pkgs/development/web/grails/default.nix b/nixpkgs/pkgs/development/web/grails/default.nix
index 018c7f969697..018c7f969697 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 264f77a7fd95..264f77a7fd95 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 485c4026afae..485c4026afae 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 a59db6d4d1ae..a59db6d4d1ae 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 8cc16fad7e56..8cc16fad7e56 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 560213897c91..560213897c91 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 a2fa509232de..a2fa509232de 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 7603e8ff2ef1..7603e8ff2ef1 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 76434809cb52..76434809cb52 100644
--- a/pkgs/development/web/minify/default.nix
+++ b/nixpkgs/pkgs/development/web/minify/default.nix
diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/nixpkgs/pkgs/development/web/nodejs/build-node-package.nix
index 5ce324e7a60f..5ce324e7a60f 100644
--- a/pkgs/development/web/nodejs/build-node-package.nix
+++ b/nixpkgs/pkgs/development/web/nodejs/build-node-package.nix
diff --git a/pkgs/development/web/nodejs/nodejs-release-keys.asc b/nixpkgs/pkgs/development/web/nodejs/nodejs-release-keys.asc
index c89b3b37f876..c89b3b37f876 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 6dc68750075c..6dc68750075c 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 18368588c2af..18368588c2af 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 39737758e765..39737758e765 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 47e1abc9b217..47e1abc9b217 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 5743868d5d96..5743868d5d96 100644
--- a/pkgs/development/web/nodejs/v10.nix
+++ b/nixpkgs/pkgs/development/web/nodejs/v10.nix
diff --git a/pkgs/development/web/nodejs/v11.nix b/nixpkgs/pkgs/development/web/nodejs/v11.nix
index 7b60a3772d3c..7b60a3772d3c 100644
--- a/pkgs/development/web/nodejs/v11.nix
+++ b/nixpkgs/pkgs/development/web/nodejs/v11.nix
diff --git a/pkgs/development/web/nodejs/v12.nix b/nixpkgs/pkgs/development/web/nodejs/v12.nix
index ae74764384c6..ae74764384c6 100644
--- a/pkgs/development/web/nodejs/v12.nix
+++ b/nixpkgs/pkgs/development/web/nodejs/v12.nix
diff --git a/pkgs/development/web/nodejs/v8.nix b/nixpkgs/pkgs/development/web/nodejs/v8.nix
index 90d88215d3fd..90d88215d3fd 100644
--- a/pkgs/development/web/nodejs/v8.nix
+++ b/nixpkgs/pkgs/development/web/nodejs/v8.nix
diff --git a/pkgs/development/web/now-cli/default.nix b/nixpkgs/pkgs/development/web/now-cli/default.nix
index 4b8a79c6190b..4b8a79c6190b 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 a09a84e4bf75..a09a84e4bf75 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 22404481f35c..22404481f35c 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 59542101812f..59542101812f 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 12282d4ea3ac..12282d4ea3ac 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 32c24174b5ec..32c24174b5ec 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 516bcebc6f48..516bcebc6f48 100644
--- a/pkgs/development/web/remarkjs/pkgs.json
+++ b/nixpkgs/pkgs/development/web/remarkjs/pkgs.json
diff --git a/pkgs/development/web/twitter-bootstrap/3.nix b/nixpkgs/pkgs/development/web/twitter-bootstrap/3.nix
index 71cda3d3d9fc..71cda3d3d9fc 100644
--- a/pkgs/development/web/twitter-bootstrap/3.nix
+++ b/nixpkgs/pkgs/development/web/twitter-bootstrap/3.nix
diff --git a/pkgs/development/web/twitter-bootstrap/default.nix b/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix
index 61e7947a4796..61e7947a4796 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 266217d94e24..266217d94e24 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 82faf32a3210..82faf32a3210 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 89b9f0427f9b..89b9f0427f9b 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 d5fe926c4c7d..d5fe926c4c7d 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 4b06ccb3f56a..4b06ccb3f56a 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/default.nix b/nixpkgs/pkgs/development/web/woff2/default.nix
index bda6dab14d8a..bda6dab14d8a 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 f0966357d93d..f0966357d93d 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 2cfddd1066ba..2cfddd1066ba 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 d53942766bb2..d53942766bb2 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 74bc52875d22..74bc52875d22 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 c001473e5104..c001473e5104 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 ca7c8e16e3c5..ca7c8e16e3c5 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 5d91bc04114b..5d91bc04114b 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 37cb96f2cfdb..37cb96f2cfdb 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 f2be128fd998..f2be128fd998 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 103b67e99edf..103b67e99edf 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 9766e58c15ae..9766e58c15ae 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 02ea6f688069..02ea6f688069 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 628a521126f5..628a521126f5 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 b5c7f4b730b8..b5c7f4b730b8 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 491b20d99690..491b20d99690 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 828cab88d989..828cab88d989 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 d4ff86c424b1..d4ff86c424b1 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 4bdfc87d8da7..4bdfc87d8da7 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 7cd9212c5a80..7cd9212c5a80 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 ce166b4b87d5..ce166b4b87d5 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 460fc049c7bf..460fc049c7bf 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 5318108c4913..5318108c4913 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 a8e9063a35f4..a8e9063a35f4 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 c8f5deef9240..c8f5deef9240 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 593622c3008b..593622c3008b 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 b2c86222f2b0..b2c86222f2b0 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 de9eb9bbb580..de9eb9bbb580 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 085bad674c79..085bad674c79 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 a8b5f9fea4d6..a8b5f9fea4d6 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 6bf26b50a142..6bf26b50a142 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 5699dbb72700..5699dbb72700 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 27ddec616bc8..27ddec616bc8 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 81bdbed46e94..81bdbed46e94 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 c8597a0303b8..c8597a0303b8 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 94a1e6ee91ab..94a1e6ee91ab 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 bf58b523e76e..bf58b523e76e 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 4c4b32b12433..4c4b32b12433 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 af1228108d8f..af1228108d8f 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 8f2804e07946..8f2804e07946 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 e658ef9f5cba..e658ef9f5cba 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 a785567adddf..a785567adddf 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 808d7e378074..808d7e378074 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 5040886eaa00..5040886eaa00 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 ef30a3d350c9..ef30a3d350c9 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 9de90069a375..9de90069a375 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 6c7e9ac76a99..6c7e9ac76a99 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 3a7b410a04bd..3a7b410a04bd 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 84a70c275a2f..84a70c275a2f 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 b872e95d5896..b872e95d5896 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 60a3dc457453..60a3dc457453 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 1b92c8816614..1b92c8816614 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 28cea5e0c779..28cea5e0c779 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 5800f8026ac4..5800f8026ac4 100644
--- a/pkgs/games/chessx/default.nix
+++ b/nixpkgs/pkgs/games/chessx/default.nix
diff --git a/pkgs/games/chocolate-doom/default.nix b/nixpkgs/pkgs/games/chocolate-doom/default.nix
index 56a926e63f6d..56a926e63f6d 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 47ab73ca269e..47ab73ca269e 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 fa3b906268dc..fa3b906268dc 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 a38678882c86..a38678882c86 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 c6ccac69b8cb..c6ccac69b8cb 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 fb2910d128ee..fb2910d128ee 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 4daea4c53a28..4daea4c53a28 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 bb06bec411bb..bb06bec411bb 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 9526512f15cc..9526512f15cc 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 67a883c16b0c..67a883c16b0c 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 ac58a43aecb0..ac58a43aecb0 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 5178474ef9e7..5178474ef9e7 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 98baafbb2fd2..98baafbb2fd2 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 c19f28c514d7..c19f28c514d7 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 8b915345f862..8b915345f862 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 c77e0c8b4850..c77e0c8b4850 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 19d857a8e78c..19d857a8e78c 100644
--- a/pkgs/games/cuyo/default.nix
+++ b/nixpkgs/pkgs/games/cuyo/default.nix
diff --git a/pkgs/games/dhewm3/default.nix b/nixpkgs/pkgs/games/dhewm3/default.nix
index 8b92c2e9d6fb..8b92c2e9d6fb 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 6da1e8ffe4b5..6da1e8ffe4b5 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 650d5da53313..650d5da53313 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 b0121bb3fa37..b0121bb3fa37 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 a77250543107..a77250543107 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 da860cd55624..da860cd55624 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 652e4c184753..652e4c184753 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 77936c430e2b..77936c430e2b 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 e3005373b95f..e3005373b95f 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 05fb0cf50800..05fb0cf50800 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 b5c80a0a56dc..b5c80a0a56dc 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 5f0328cba02d..5f0328cba02d 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 3bc4fa9c4bb5..3bc4fa9c4bb5 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 caa9adeefd06..caa9adeefd06 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 feb4782d7c32..feb4782d7c32 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 f2cc4ed3ac7d..f2cc4ed3ac7d 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 e1f8e8abab80..e1f8e8abab80 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 c4d01b3ff392..c4d01b3ff392 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 3db68122d358..3db68122d358 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 06bc6ca1fe51..06bc6ca1fe51 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 4cf884ebed2c..4cf884ebed2c 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 054935af012e..054935af012e 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 4448bd05fda5..4448bd05fda5 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 28357ed7579f..28357ed7579f 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 682d1e05069a..682d1e05069a 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 86d233b03785..86d233b03785 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 020a4593de24..020a4593de24 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 c8b85da213a5..c8b85da213a5 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 206ed02e69ce..206ed02e69ce 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 f80c1b2f78d7..f80c1b2f78d7 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 3407659d977b..3407659d977b 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 98ab4d27d5f5..98ab4d27d5f5 100644
--- a/pkgs/games/egoboo/default.nix
+++ b/nixpkgs/pkgs/games/egoboo/default.nix
diff --git a/pkgs/games/empty-epsilon/default.nix b/nixpkgs/pkgs/games/empty-epsilon/default.nix
index cb46b8d9ba27..cb46b8d9ba27 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 8b259bad88d7..8b259bad88d7 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 447724a2043f..447724a2043f 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 cad7a6acaed0..cad7a6acaed0 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 742ca9591357..742ca9591357 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 911308a078a5..911308a078a5 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 fba1ce01c45a..fba1ce01c45a 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 70de34184a24..70de34184a24 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 58fdaeb8f740..58fdaeb8f740 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 85433e116fbc..85433e116fbc 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 40df1b83cbc9..40df1b83cbc9 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 501665494ebf..501665494ebf 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 563ece6cb9c2..563ece6cb9c2 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 1aab0933b1bf..1aab0933b1bf 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 2ab6e04e2d82..2ab6e04e2d82 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 5ae656d1fc18..5ae656d1fc18 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 8b620835f857..8b620835f857 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 b10d7dfedb0f..b10d7dfedb0f 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 728709a12f62..728709a12f62 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 ef46ea840b79..ef46ea840b79 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 35bc22e87897..35bc22e87897 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 9fc260e74062..9fc260e74062 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 d5efe2b3ebd9..d5efe2b3ebd9 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 2ebb60f3d5db..2ebb60f3d5db 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 125f02005a33..125f02005a33 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 3f82533dd60d..3f82533dd60d 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 f0db646b81ad..f0db646b81ad 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 dd0707fe5c39..dd0707fe5c39 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 ec2cb9416661..ec2cb9416661 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 51975c17a8ee..51975c17a8ee 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 5a01d2512c42..5a01d2512c42 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 3b4fb6842dbb..3b4fb6842dbb 100644
--- a/pkgs/games/frotz/default.nix
+++ b/nixpkgs/pkgs/games/frotz/default.nix
diff --git a/pkgs/games/fsg/default.nix b/nixpkgs/pkgs/games/fsg/default.nix
index d334439cafb8..d334439cafb8 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 dd27f96f7d40..dd27f96f7d40 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 dabcfb19db04..dabcfb19db04 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 ea10ee4163b4..ea10ee4163b4 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 066cadb13b17..066cadb13b17 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 ed0daec4ef1f..ed0daec4ef1f 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 62ea798e4656..62ea798e4656 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 20e3f69152c6..20e3f69152c6 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 eb4c64727bce..eb4c64727bce 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 8d41070a61e0..8d41070a61e0 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 b718a92143cb..b718a92143cb 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 fc7bf7168ddf..fc7bf7168ddf 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 b9694811fa51..b9694811fa51 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 edfb05d237cd..edfb05d237cd 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 6c8dd922c255..6c8dd922c255 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 1eaedf08820d..1eaedf08820d 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 bd3ae0b2e123..bd3ae0b2e123 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 71078ae553f7..71078ae553f7 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 78936ec19499..78936ec19499 100644
--- a/pkgs/games/gmad/default.nix
+++ b/nixpkgs/pkgs/games/gmad/default.nix
diff --git a/pkgs/games/gnubg/default.nix b/nixpkgs/pkgs/games/gnubg/default.nix
index ff09a70e932e..ff09a70e932e 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 62c5ee803047..62c5ee803047 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 f19dca51addc..f19dca51addc 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 2952edaa78d9..2952edaa78d9 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 64c3954ba485..64c3954ba485 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 e85674550308..e85674550308 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 e89d16b788a6..e89d16b788a6 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 fc73f89f66c0..fc73f89f66c0 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 d3fff64ada6d..d3fff64ada6d 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 f1c24ba4de8b..f1c24ba4de8b 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 b29b045a4217..b29b045a4217 100644
--- a/pkgs/games/gtypist/default.nix
+++ b/nixpkgs/pkgs/games/gtypist/default.nix
diff --git a/pkgs/games/gzdoom/default.nix b/nixpkgs/pkgs/games/gzdoom/default.nix
index ed24f44356ae..ed24f44356ae 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 cca17ceee5af..cca17ceee5af 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 a785567adddf..a785567adddf 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 470e1d090fcd..470e1d090fcd 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 16a79683149d..16a79683149d 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 6953ac2f57a5..6953ac2f57a5 100644
--- a/pkgs/games/hedgewars/default.nix
+++ b/nixpkgs/pkgs/games/hedgewars/default.nix
diff --git a/pkgs/games/hexen/default.nix b/nixpkgs/pkgs/games/hexen/default.nix
index 48379da3a0a4..48379da3a0a4 100644
--- a/pkgs/games/hexen/default.nix
+++ b/nixpkgs/pkgs/games/hexen/default.nix
diff --git a/pkgs/games/holdingnuts/default.nix b/nixpkgs/pkgs/games/holdingnuts/default.nix
index e6d6febeac6f..e6d6febeac6f 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 760d82c026d2..760d82c026d2 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 ba9173c04921..ba9173c04921 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 39324843e5e5..39324843e5e5 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 f63737bfb160..f63737bfb160 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 b0acd789afee..b0acd789afee 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 f84b83a3010d..f84b83a3010d 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 d017e93e4dba..d017e93e4dba 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 37c45e7aa603..37c45e7aa603 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 b86589fc6716..b86589fc6716 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 50d261db8651..50d261db8651 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 64522e568db6..64522e568db6 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 4cea30c79e6d..4cea30c79e6d 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 b6d14085351e..b6d14085351e 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 7a9ef355a821..7a9ef355a821 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 b5f858b99ad7..b5f858b99ad7 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 d00072d24551..d00072d24551 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 daf7dd7f61f4..daf7dd7f61f4 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 fef6e11d9be9..fef6e11d9be9 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 0abbfda33c7b..0abbfda33c7b 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 b860d2ee58b1..b860d2ee58b1 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 1fcf9c9527bd..1fcf9c9527bd 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 d748c96da242..d748c96da242 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 af7101f216d5..af7101f216d5 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 10a79a696732..10a79a696732 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 bf53fcf8467b..bf53fcf8467b 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 cad98650c24e..cad98650c24e 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 2639765c5d15..2639765c5d15 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 da711f59af02..da711f59af02 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 668605a9ae10..668605a9ae10 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 15a5c07060e2..15a5c07060e2 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 2aef6eb5cf66..2aef6eb5cf66 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 de67afe45a94..de67afe45a94 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 21d2ad87dfb8..21d2ad87dfb8 100644
--- a/pkgs/games/meritous/default.nix
+++ b/nixpkgs/pkgs/games/meritous/default.nix
diff --git a/pkgs/games/minecraft-server/default.nix b/nixpkgs/pkgs/games/minecraft-server/default.nix
index cc91d867f1d8..cc91d867f1d8 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 32830d6f3d06..32830d6f3d06 100644
--- a/pkgs/games/minecraft/default.nix
+++ b/nixpkgs/pkgs/games/minecraft/default.nix
diff --git a/pkgs/games/minetest/default.nix b/nixpkgs/pkgs/games/minetest/default.nix
index 17366ae99040..17366ae99040 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 99c369fdce80..99c369fdce80 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 d0c07b71e2ea..d0c07b71e2ea 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 aa4a06bc7d2b..aa4a06bc7d2b 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 dab83ddc900d..dab83ddc900d 100644
--- a/pkgs/games/mudlet/default.nix
+++ b/nixpkgs/pkgs/games/mudlet/default.nix
diff --git a/pkgs/games/mudlet/libs.patch b/nixpkgs/pkgs/games/mudlet/libs.patch
index 45b693828ff2..45b693828ff2 100644
--- a/pkgs/games/mudlet/libs.patch
+++ b/nixpkgs/pkgs/games/mudlet/libs.patch
diff --git a/pkgs/games/multimc/default.nix b/nixpkgs/pkgs/games/multimc/default.nix
index 7e6e034a2b50..7e6e034a2b50 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 ae086af184c6..ae086af184c6 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 d8a4e32faaab..d8a4e32faaab 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 5e476cdc7e98..5e476cdc7e98 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 50f96a7ee2c8..50f96a7ee2c8 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 c806dfa5b806..c806dfa5b806 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 39b3ae36f506..39b3ae36f506 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 bcbbc9e7756b..bcbbc9e7756b 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 45fd82a0845b..45fd82a0845b 100644
--- a/pkgs/games/njam/logfile.patch
+++ b/nixpkgs/pkgs/games/njam/logfile.patch
diff --git a/pkgs/games/odamex/default.nix b/nixpkgs/pkgs/games/odamex/default.nix
index c70744ea2991..c70744ea2991 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 1d56d86f5301..1d56d86f5301 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 921ed8a72f33..921ed8a72f33 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 8ac020f3ce09..8ac020f3ce09 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 fa0411196318..fa0411196318 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 0f045faf371e..0f045faf371e 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 bcffd7a22bcf..bcffd7a22bcf 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 3c4e85a91e5a..3c4e85a91e5a 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 1da23a98f71f..1da23a98f71f 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 4b1385f3e10d..4b1385f3e10d 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 c57fe642dc3d..c57fe642dc3d 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 a3ad0e637e5a..a3ad0e637e5a 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 b0d1f2a5455e..b0d1f2a5455e 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 2e8533f7816e..2e8533f7816e 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 7d2d007d0758..7d2d007d0758 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 1c3d2308d972..1c3d2308d972 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 7b2cf0b89c0e..7b2cf0b89c0e 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 88b53e71e1bc..88b53e71e1bc 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 8489d5a97a7c..8489d5a97a7c 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 8df5922a4418..8df5922a4418 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 a045e365eceb..a045e365eceb 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 090b6c1325d1..090b6c1325d1 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 c09b697771a3..c09b697771a3 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 926e360a1b4c..926e360a1b4c 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 63fb24dc4d7d..63fb24dc4d7d 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 e0acf60144ed..e0acf60144ed 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 2fd27d2f9d63..2fd27d2f9d63 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 c91f9807581e..c91f9807581e 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 211172cee203..211172cee203 100644
--- a/pkgs/games/openxcom/default.nix
+++ b/nixpkgs/pkgs/games/openxcom/default.nix
diff --git a/pkgs/games/orthorobot/default.nix b/nixpkgs/pkgs/games/orthorobot/default.nix
index 377dc8652292..377dc8652292 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 59e7c874d141..59e7c874d141 100644
--- a/pkgs/games/pacvim/default.nix
+++ b/nixpkgs/pkgs/games/pacvim/default.nix
diff --git a/pkgs/games/performous/default.nix b/nixpkgs/pkgs/games/performous/default.nix
index c73c346512f9..c73c346512f9 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 6beb68b97abc..6beb68b97abc 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 6b4eb31aa5f6..6b4eb31aa5f6 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 b6035918af7b..b6035918af7b 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 53de9fa29e2d..53de9fa29e2d 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 391ced362075..391ced362075 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 e32bc06b8f5e..e32bc06b8f5e 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 74e5e50b4e85..74e5e50b4e85 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 520f6503edfd..520f6503edfd 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 05b02fe5d73b..05b02fe5d73b 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 d4945d43c7d7..d4945d43c7d7 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 6991735962d7..6991735962d7 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 85424ebea9ba..85424ebea9ba 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 d9f1cf4e09f5..d9f1cf4e09f5 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 924101c2d4a8..924101c2d4a8 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 c1d1e399ec1a..c1d1e399ec1a 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 dfd384761921..dfd384761921 100644
--- a/pkgs/games/qqwing/default.nix
+++ b/nixpkgs/pkgs/games/qqwing/default.nix
diff --git a/pkgs/games/quake2/yquake2/default.nix b/nixpkgs/pkgs/games/quake2/yquake2/default.nix
index 1564ba19bd2e..1564ba19bd2e 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 059fb26eb9b8..059fb26eb9b8 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 9ab086f96a21..9ab086f96a21 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 88ba8679e8a7..88ba8679e8a7 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 f35aaaad3527..f35aaaad3527 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 7bc0863a33f8..7bc0863a33f8 100644
--- a/pkgs/games/quake3/ioquake/default.nix
+++ b/nixpkgs/pkgs/games/quake3/ioquake/default.nix
diff --git a/pkgs/games/quake3/wrapper/default.nix b/nixpkgs/pkgs/games/quake3/wrapper/default.nix
index 4ab53d677324..4ab53d677324 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 f61b0e237925..f61b0e237925 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 4cd073869dc8..4cd073869dc8 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 1a8cbbea5f9c..1a8cbbea5f9c 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 a994bb1a6cbe..a994bb1a6cbe 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 d11315cd6dfa..d11315cd6dfa 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 910eaf390f4c..910eaf390f4c 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 fe8fb5243b84..fe8fb5243b84 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 c44072309b19..c44072309b19 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 b6a74ad8be65..b6a74ad8be65 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 274a095de6f4..274a095de6f4 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 7cbfacd0b409..7cbfacd0b409 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 df89f9dc743d..df89f9dc743d 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 3d076afb39e3..3d076afb39e3 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 ac6fdee1f6b5..ac6fdee1f6b5 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 00d73f95bdb3..00d73f95bdb3 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 c0b07814aa57..c0b07814aa57 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 c8af2331b080..c8af2331b080 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 8b07a38c7bb7..8b07a38c7bb7 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 a56365778fb1..a56365778fb1 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 3a9635f67124..3a9635f67124 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 63f31d7ef9e0..63f31d7ef9e0 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 79fef6740023..79fef6740023 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 301991c1a6fd..301991c1a6fd 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 430b22c9ba97..430b22c9ba97 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 35eb63d07022..35eb63d07022 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 b8bf4efcf0aa..b8bf4efcf0aa 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 2ebc2c82e506..2ebc2c82e506 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 a96250e7acb6..a96250e7acb6 100644
--- a/pkgs/games/scummvm/games.nix
+++ b/nixpkgs/pkgs/games/scummvm/games.nix
diff --git a/pkgs/games/sdlmame/default.nix b/nixpkgs/pkgs/games/sdlmame/default.nix
index 9f90c9f14aac..9f90c9f14aac 100644
--- a/pkgs/games/sdlmame/default.nix
+++ b/nixpkgs/pkgs/games/sdlmame/default.nix
diff --git a/pkgs/games/sgt-puzzles/default.nix b/nixpkgs/pkgs/games/sgt-puzzles/default.nix
index ce8d38ca5d1d..ce8d38ca5d1d 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 b6d048b68ae9..b6d048b68ae9 100644
--- a/pkgs/games/sgt-puzzles/default.upstream
+++ b/nixpkgs/pkgs/games/sgt-puzzles/default.upstream
diff --git a/pkgs/games/sienna/default.nix b/nixpkgs/pkgs/games/sienna/default.nix
index 58ed85c79fdb..58ed85c79fdb 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 de91f26d95de..de91f26d95de 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 5cbb3c1796f1..5cbb3c1796f1 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 f37e15a22dfe..f37e15a22dfe 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 e8d915dd31a5..e8d915dd31a5 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 7f9f49f363a8..7f9f49f363a8 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 1049b10d0b19..1049b10d0b19 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 162db9672699..162db9672699 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 2556aa49b4c1..2556aa49b4c1 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 1dcf432ccd48..1dcf432ccd48 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 b31160a05cc6..b31160a05cc6 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 79a42cefa5a6..79a42cefa5a6 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 8df4450d13d1..8df4450d13d1 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 1408b66ab41b..1408b66ab41b 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 e0ff5cebd933..e0ff5cebd933 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 ddf974671a03..ddf974671a03 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 3cf2d8966452..3cf2d8966452 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 5aab54b83221..5aab54b83221 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 dab393a86fb3..dab393a86fb3 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 76a472eb3b38..76a472eb3b38 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 49986a346e8e..49986a346e8e 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 a851b5b8d978..a851b5b8d978 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 1fa17c32d6c7..1fa17c32d6c7 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 3e29ceb5b01f..3e29ceb5b01f 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 1ea7f0677877..1ea7f0677877 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 588badb41a1a..588badb41a1a 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 bb9362b9bf05..bb9362b9bf05 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 d33165b309da..d33165b309da 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 864888741660..864888741660 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 13033c7f9f0a..13033c7f9f0a 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 3865d8fbef9e..3865d8fbef9e 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 0bdd1f9f62df..0bdd1f9f62df 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 cee65bfa5638..cee65bfa5638 100644
--- a/pkgs/games/supertux/default.nix
+++ b/nixpkgs/pkgs/games/supertux/default.nix
diff --git a/pkgs/games/t4kcommon/default.nix b/nixpkgs/pkgs/games/t4kcommon/default.nix
index f576403b70b2..f576403b70b2 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 57e7217fcdbd..57e7217fcdbd 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 e18faf7c304e..e18faf7c304e 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 7933ef2f0695..7933ef2f0695 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 f0c40274d9a1..f0c40274d9a1 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 283d8ad21d7e..283d8ad21d7e 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 d58aa3a8129f..d58aa3a8129f 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 13d296e5961a..13d296e5961a 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 68114bb75652..68114bb75652 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 929641cfab54..929641cfab54 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 02c55d7d06c9..02c55d7d06c9 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 eb4299a4092c..eb4299a4092c 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 f230a70c0880..f230a70c0880 100644
--- a/pkgs/games/tinyfugue/default.nix
+++ b/nixpkgs/pkgs/games/tinyfugue/default.nix
diff --git a/pkgs/games/tome4/default.nix b/nixpkgs/pkgs/games/tome4/default.nix
index ec529676463f..ec529676463f 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 cf037a0f4362..cf037a0f4362 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 67d7f82457f9..67d7f82457f9 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 8549a860d8e8..8549a860d8e8 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 470856af90e6..470856af90e6 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 12a73138c099..12a73138c099 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 0050ef19cea2..0050ef19cea2 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 ddf0782b210d..ddf0782b210d 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 0824b2becf49..0824b2becf49 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 6b2fb8178eac..6b2fb8178eac 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 6f0afc359ab4..6f0afc359ab4 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 fe313a4392ed..fe313a4392ed 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 76c11c6baa70..76c11c6baa70 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 fa28dcefa5e0..fa28dcefa5e0 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 91cab1ca32f5..91cab1ca32f5 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 b9cc8a6cd6dd..b9cc8a6cd6dd 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 f699a6a05c62..f699a6a05c62 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 63da46854857..63da46854857 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 f3eec52098d0..f3eec52098d0 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 be1b5bd11956..be1b5bd11956 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 8d1bf2b68872..8d1bf2b68872 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 00592f7c39bb..00592f7c39bb 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 1cd87541b8c3..1cd87541b8c3 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 3f306ac6eb54..3f306ac6eb54 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 7039ff44a09b..7039ff44a09b 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 31d0763be4d2..31d0763be4d2 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 0209fd83b1c6..0209fd83b1c6 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 84984fcbb587..84984fcbb587 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 6794e8018aff..6794e8018aff 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 6c571da561c5..6c571da561c5 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 f1e9c13f86b0..f1e9c13f86b0 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 483912bab45e..483912bab45e 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 38ee2b6ce2e8..38ee2b6ce2e8 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 d57559a4d804..d57559a4d804 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 91f77277d9ec..91f77277d9ec 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 c1a9a2a7defb..c1a9a2a7defb 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 04712b3ebff6..04712b3ebff6 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 1b51130768eb..1b51130768eb 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 12832f2a4391..12832f2a4391 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 ad2487102379..ad2487102379 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 6165cacfdca5..6165cacfdca5 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 bf9e1cdd6354..bf9e1cdd6354 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 ed6a99125223..ed6a99125223 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 daf56b27e5d2..daf56b27e5d2 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 7d8380e9f7ce..7d8380e9f7ce 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 119cd8f08769..119cd8f08769 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 4a8e7188ce89..4a8e7188ce89 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 2e5af5d08725..2e5af5d08725 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 946bff79f975..946bff79f975 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 6e8526399794..6e8526399794 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 8221677658e3..8221677658e3 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 028b5f49b66a..028b5f49b66a 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 a0fc6d5ca718..a0fc6d5ca718 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 ac7bf7973d77..ac7bf7973d77 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 cd927a820aaa..cd927a820aaa 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 42bcb3263169..42bcb3263169 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 2ae25e957bb2..2ae25e957bb2 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 5618399bfecd..5618399bfecd 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 383bdb882844..383bdb882844 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 07ed50d4e7b3..07ed50d4e7b3 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 0aa0c97f07d2..0aa0c97f07d2 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 cf08db68cf03..cf08db68cf03 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 9203389355c7..9203389355c7 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 4d8d7c837961..4d8d7c837961 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 ce32e435608b..ce32e435608b 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 d6dd3a58f457..d6dd3a58f457 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 a5d9098242bd..a5d9098242bd 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 3d60dab6fe00..3d60dab6fe00 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 0cf7150502e4..0cf7150502e4 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 3d5da2391157..3d5da2391157 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 9d42cfd6896d..9d42cfd6896d 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 2a1219e66ea0..2a1219e66ea0 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 4a352cb1e471..4a352cb1e471 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 d2b94a14fe41..d2b94a14fe41 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 fa2cafa298ac..fa2cafa298ac 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 da2f256aeb71..da2f256aeb71 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 449d7ae6e2d5..449d7ae6e2d5 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 4076a8c3a3af..4076a8c3a3af 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 273e358184d3..273e358184d3 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 710712fe5084..710712fe5084 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 01c35d99ae7e..01c35d99ae7e 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 af57f2a90de3..af57f2a90de3 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 e1e436010b4b..e1e436010b4b 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 f13c62f04a98..f13c62f04a98 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 3266c128bc4e..3266c128bc4e 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 9df36bde4b06..9df36bde4b06 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 72b7de3b9a27..72b7de3b9a27 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 ce097bd5f231..ce097bd5f231 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 6292b8183b28..6292b8183b28 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 618bc6d85059..618bc6d85059 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 f0be3cad723c..f0be3cad723c 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 11873e6f2a06..11873e6f2a06 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 4464b5ba11b3..4464b5ba11b3 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 2df3cfe67334..2df3cfe67334 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 08cc222e4a5b..08cc222e4a5b 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/canon/default.nix b/nixpkgs/pkgs/misc/cups/drivers/canon/default.nix
index 9c5ef1d02836..9c5ef1d02836 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 f3a30063a6e3..f3a30063a6e3 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 2634b7128719..2634b7128719 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 27b86ab89198..27b86ab89198 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 f5b3a1b13db5..f5b3a1b13db5 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 20c2d756d1eb..20c2d756d1eb 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 c8e5ddd09b14..c8e5ddd09b14 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 dfc0bb2268cb..dfc0bb2268cb 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 6b51d4837d45..6b51d4837d45 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 92bef72ba056..92bef72ba056 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 dc85801a256b..dc85801a256b 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 7dba79995114..7dba79995114 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 f38ed7f0309e..f38ed7f0309e 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 8abda27a5cf2..8abda27a5cf2 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 fa7df5591dda..fa7df5591dda 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 83093da9c0aa..83093da9c0aa 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/googlecloudprint/default.nix b/nixpkgs/pkgs/misc/cups/drivers/googlecloudprint/default.nix
index b3fc87fbf1da..b3fc87fbf1da 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 701d4b6a1002..701d4b6a1002 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 001a3c1eac09..001a3c1eac09 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 55b0deea9717..55b0deea9717 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 9b40e4ff50e1..9b40e4ff50e1 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 bcd2914da0ce..bcd2914da0ce 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 72a40f41f885..72a40f41f885 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 f31dd9061ec3..f31dd9061ec3 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 4b31ccf38774..4b31ccf38774 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 9d9535ce37b0..9d9535ce37b0 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 1673c2d5c5c8..1673c2d5c5c8 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 8e31cd2956a5..8e31cd2956a5 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 2099291d434b..2099291d434b 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 8dbc56fe846d..8dbc56fe846d 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 0da85498723f..0da85498723f 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 6d3cf18e5296..6d3cf18e5296 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 17040498acc0..17040498acc0 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 a521b3ea0218..a521b3ea0218 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 b395d73a2669..b395d73a2669 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 e98da9de2b60..e98da9de2b60 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 b2c4bbb0f203..b2c4bbb0f203 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 f750df6e5063..f750df6e5063 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 df0a270a5b2b..df0a270a5b2b 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 547e25b6514e..547e25b6514e 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 e227de086de6..e227de086de6 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 9321cf526bee..9321cf526bee 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 8b05975c1676..8b05975c1676 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 422deb7350fe..422deb7350fe 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 f4baa3c8e001..f4baa3c8e001 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 a9fbcc178bb8..a9fbcc178bb8 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 f909702367ec..f909702367ec 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 4ad7dbf24b51..4ad7dbf24b51 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 884c97c7673f..884c97c7673f 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 3b77af4af416..3b77af4af416 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 37acfbf4a8ab..37acfbf4a8ab 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 9cabd8fa3396..9cabd8fa3396 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 d865a8906cfb..d865a8906cfb 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 58ea849d8f9d..58ea849d8f9d 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 c61bfb806c59..c61bfb806c59 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 2277a9afcccf..2277a9afcccf 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 1dac6034fdab..1dac6034fdab 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 71d86668f53d..71d86668f53d 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 fb546b6a25b7..fb546b6a25b7 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 ce95ca00e110..ce95ca00e110 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 02897f4f44d9..02897f4f44d9 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 9ce6f5d7b010..9ce6f5d7b010 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 15a7ba3cd3c4..15a7ba3cd3c4 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 2a92f8a59d91..2a92f8a59d91 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 7e1ff01bda05..7e1ff01bda05 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 003272858a42..003272858a42 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 580b473b0cd6..580b473b0cd6 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 6cf754192f86..6cf754192f86 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 7c8750905d9c..7c8750905d9c 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 8f5004693eac..8f5004693eac 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 2be65e40c45f..2be65e40c45f 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 ea9554288091..ea9554288091 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 9d19a93f3644..9d19a93f3644 100644
--- a/pkgs/misc/drivers/hplip/hplip.state
+++ b/nixpkgs/pkgs/misc/drivers/hplip/hplip.state
diff --git a/pkgs/misc/drivers/m33-linux/default.nix b/nixpkgs/pkgs/misc/drivers/m33-linux/default.nix
index 492488f675f2..492488f675f2 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 31b13baf7964..31b13baf7964 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 a7d5710a2793..a7d5710a2793 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 764e60ac13ba..764e60ac13ba 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 d44c90d198a9..d44c90d198a9 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 35a9bd2e3844..35a9bd2e3844 100644
--- a/pkgs/misc/drivers/sundtek/default.nix
+++ b/nixpkgs/pkgs/misc/drivers/sundtek/default.nix
diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/nixpkgs/pkgs/misc/drivers/xboxdrv/default.nix
index c942ec59f37e..c942ec59f37e 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 a21584afa4c2..a21584afa4c2 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 36f6ca5b8c0c..36f6ca5b8c0c 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 5a37b1b32c5b..5a37b1b32c5b 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 4806c7f9e0f1..4806c7f9e0f1 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 601503dc07ec..601503dc07ec 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 666f953f6b57..666f953f6b57 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 8575d654febf..8575d654febf 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 a8068e9b47b6..a8068e9b47b6 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 a560ecd0a21d..a560ecd0a21d 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 a57fda56ddd4..a57fda56ddd4 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 e587151d3e72..e587151d3e72 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 dbf471d35d1d..dbf471d35d1d 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 a80327ce91c0..a80327ce91c0 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 331ad0ded248..331ad0ded248 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 0ead78305cd0..0ead78305cd0 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 33c5d3cebf14..33c5d3cebf14 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 3e8f78c44115..3e8f78c44115 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 70e7351e295c..70e7351e295c 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 612aa1e3911e..612aa1e3911e 100644
--- a/pkgs/misc/emulators/darcnes/label.patch
+++ b/nixpkgs/pkgs/misc/emulators/darcnes/label.patch
diff --git a/pkgs/misc/emulators/desmume/default.nix b/nixpkgs/pkgs/misc/emulators/desmume/default.nix
index d177012546e9..d177012546e9 100644
--- a/pkgs/misc/emulators/desmume/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/desmume/default.nix
diff --git a/pkgs/misc/emulators/dlx/default.nix b/nixpkgs/pkgs/misc/emulators/dlx/default.nix
index 358cc59d3db0..358cc59d3db0 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 392f5618b6e5..392f5618b6e5 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 d44560b4ddf4..d44560b4ddf4 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 fb63554871a2..fb63554871a2 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 9dec1ecacae0..9dec1ecacae0 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 5fee8b4b83d4..5fee8b4b83d4 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 90799d977a14..90799d977a14 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 eb7964cc017d..eb7964cc017d 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 13ebeb1d2a96..13ebeb1d2a96 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 882bf13f4eaf..882bf13f4eaf 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 9856c93eda2d..9856c93eda2d 100644
--- a/pkgs/misc/emulators/fs-uae/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/fs-uae/default.nix
diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/nixpkgs/pkgs/misc/emulators/gens-gs/default.nix
index 418d6440b694..418d6440b694 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 ea2d6bbfecc8..ea2d6bbfecc8 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 3cb0f787ce76..3cb0f787ce76 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 5821a9c130b0..5821a9c130b0 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 1349fa0f0b6f..1349fa0f0b6f 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 01785bd9a27e..01785bd9a27e 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 32201c48ee98..32201c48ee98 100644
--- a/pkgs/misc/emulators/libdsk/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/libdsk/default.nix
diff --git a/pkgs/misc/emulators/mednafen/default.nix b/nixpkgs/pkgs/misc/emulators/mednafen/default.nix
index 9101c1587c25..9101c1587c25 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 75eeeea4c008..75eeeea4c008 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 c62d9c90ca79..c62d9c90ca79 100644
--- a/pkgs/misc/emulators/mednaffe/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/mednaffe/default.nix
diff --git a/pkgs/misc/emulators/mess/default.nix b/nixpkgs/pkgs/misc/emulators/mess/default.nix
index fc63bf705f4e..fc63bf705f4e 100644
--- a/pkgs/misc/emulators/mess/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/mess/default.nix
diff --git a/pkgs/misc/emulators/mgba/default.nix b/nixpkgs/pkgs/misc/emulators/mgba/default.nix
index 7a5ed31a5803..7a5ed31a5803 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 9ff99110eccf..9ff99110eccf 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 a7d82ead15ca..a7d82ead15ca 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 9eb353ede583..9eb353ede583 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 65dcc72c0c25..65dcc72c0c25 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 9098762e40d5..9098762e40d5 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 d2539cbc8171..d2539cbc8171 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 851c05c0578b..851c05c0578b 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 5af3042bde4d..5af3042bde4d 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 356868ce7a8b..356868ce7a8b 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 159eefad6662..159eefad6662 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 65cc0bd9c05a..65cc0bd9c05a 100644
--- a/pkgs/misc/emulators/qmc2/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/qmc2/default.nix
diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/nixpkgs/pkgs/misc/emulators/retroarch/cores.nix
index 3f20390fba73..3f20390fba73 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 ee7ff114ec8f..ee7ff114ec8f 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 1072a66e0eac..1072a66e0eac 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 71ae168f1b23..71ae168f1b23 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 2537669bbc42..2537669bbc42 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 02eef2594ea6..02eef2594ea6 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 4c44377c11e6..4c44377c11e6 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 a58f95875ccf..a58f95875ccf 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 41ba5a3b2e61..41ba5a3b2e61 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 8186aba1ee56..8186aba1ee56 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 313b61b393e4..313b61b393e4 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 c8712d208590..c8712d208590 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 7cf4faf55cd7..7cf4faf55cd7 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 e86db53c88a6..e86db53c88a6 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 c006db3116b5..c006db3116b5 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/default.nix b/nixpkgs/pkgs/misc/emulators/wine/default.nix
index 6ecca6c25032..6ecca6c25032 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 0ee1b3973d86..0ee1b3973d86 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 3ea60e62c665..3ea60e62c665 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 e4958b8cfc32..e4958b8cfc32 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 5264e66279f7..5264e66279f7 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 b90a68e72df5..b90a68e72df5 100644
--- a/pkgs/misc/emulators/wine/util.nix
+++ b/nixpkgs/pkgs/misc/emulators/wine/util.nix
diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/nixpkgs/pkgs/misc/emulators/wine/winetricks.nix
index 76606edf53c3..76606edf53c3 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 1199f987bb6a..1199f987bb6a 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 3806d25e5d00..3806d25e5d00 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 43539ef4ca58..43539ef4ca58 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 a2d462fd990e..a2d462fd990e 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 bb0491b373f8..bb0491b373f8 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 1ea8d7e68d3c..1ea8d7e68d3c 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 1aae47e603b5..1aae47e603b5 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 2b38ed57c285..2b38ed57c285 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 446aac629829..446aac629829 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 7380ba2f9953..7380ba2f9953 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 9a4aab0bbbef..9a4aab0bbbef 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 991be274ecc9..991be274ecc9 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 f3d5450c94ba..f3d5450c94ba 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 e592b945a408..e592b945a408 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 fb7c26a6d7ae..fb7c26a6d7ae 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 8c9838ccec53..8c9838ccec53 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 297ca955e86d..297ca955e86d 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 7f355bc81560..7f355bc81560 100644
--- a/pkgs/misc/libcardiacarrest/default.nix
+++ b/nixpkgs/pkgs/misc/libcardiacarrest/default.nix
diff --git a/pkgs/misc/lilypond/default.nix b/nixpkgs/pkgs/misc/lilypond/default.nix
index 7738c9b1c091..7738c9b1c091 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 30e130bc8ad8..30e130bc8ad8 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 00335eddce86..00335eddce86 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 5b548038da9f..5b548038da9f 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 36dbcf170dd5..36dbcf170dd5 100644
--- a/pkgs/misc/lilypond/with-fonts.nix
+++ b/nixpkgs/pkgs/misc/lilypond/with-fonts.nix
diff --git a/pkgs/misc/logging/beats/5.x.nix b/nixpkgs/pkgs/misc/logging/beats/5.x.nix
index fb8bb5a85c8b..fb8bb5a85c8b 100644
--- a/pkgs/misc/logging/beats/5.x.nix
+++ b/nixpkgs/pkgs/misc/logging/beats/5.x.nix
diff --git a/pkgs/misc/logging/beats/6.x.nix b/nixpkgs/pkgs/misc/logging/beats/6.x.nix
index 2f7e38692eb1..2f7e38692eb1 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 12e08dfeec69..12e08dfeec69 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 1a064e8c627d..1a064e8c627d 100644
--- a/pkgs/misc/long-shebang/default.nix
+++ b/nixpkgs/pkgs/misc/long-shebang/default.nix
diff --git a/pkgs/misc/mnemonicode/default.nix b/nixpkgs/pkgs/misc/mnemonicode/default.nix
index d977d822351e..d977d822351e 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 fe9e8d3f4b00..fe9e8d3f4b00 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 fb8de9b6a71f..fb8de9b6a71f 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 1688d2f158fb..1688d2f158fb 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 e724869b235c..e724869b235c 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 e877629bcb03..e877629bcb03 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 25441a30d86b..25441a30d86b 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 20ba1295c422..20ba1295c422 100644
--- a/pkgs/misc/scrcpy/default.nix
+++ b/nixpkgs/pkgs/misc/scrcpy/default.nix
diff --git a/pkgs/misc/screensavers/alock/default.nix b/nixpkgs/pkgs/misc/screensavers/alock/default.nix
index 59d5a146e165..59d5a146e165 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 cd5db3067f41..cd5db3067f41 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 3bbbfcfd613d..3bbbfcfd613d 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 6b28c39f7679..6b28c39f7679 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 b3c48cb40249..b3c48cb40249 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 0b840448f2c0..0b840448f2c0 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 9855e8688867..9855e8688867 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 404346bba631..404346bba631 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 e8b9346a8727..e8b9346a8727 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 f5e8b60cea06..f5e8b60cea06 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 ae89bbd53cc6..ae89bbd53cc6 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 64f432434324..64f432434324 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 b6f82cd45d7c..b6f82cd45d7c 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 c3cfbaf23b3f..c3cfbaf23b3f 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 3edfa9553d6d..3edfa9553d6d 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 500f7a9c5a3f..500f7a9c5a3f 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 a278e6dc949f..a278e6dc949f 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 1aa1f347ab45..1aa1f347ab45 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 a75c6c1ec76d..a75c6c1ec76d 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 bd8e9671ddac..bd8e9671ddac 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 4fef8d080434..4fef8d080434 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 6db3b44b6866..6db3b44b6866 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 7c082cbbbb0f..7c082cbbbb0f 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 ec8ef076c2fc..ec8ef076c2fc 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 8154e417e065..8154e417e065 100644
--- a/pkgs/misc/talkfilters/default.nix
+++ b/nixpkgs/pkgs/misc/talkfilters/default.nix
diff --git a/pkgs/misc/themes/adapta-kde/default.nix b/nixpkgs/pkgs/misc/themes/adapta-kde/default.nix
index 875973c9d3f5..875973c9d3f5 100644
--- a/pkgs/misc/themes/adapta-kde/default.nix
+++ b/nixpkgs/pkgs/misc/themes/adapta-kde/default.nix
diff --git a/pkgs/misc/themes/adapta/default.nix b/nixpkgs/pkgs/misc/themes/adapta/default.nix
index cb281e68dfd7..cb281e68dfd7 100644
--- a/pkgs/misc/themes/adapta/default.nix
+++ b/nixpkgs/pkgs/misc/themes/adapta/default.nix
diff --git a/pkgs/misc/themes/adwaita-qt/default.nix b/nixpkgs/pkgs/misc/themes/adwaita-qt/default.nix
index f2a682bcf7dc..f2a682bcf7dc 100644
--- a/pkgs/misc/themes/adwaita-qt/default.nix
+++ b/nixpkgs/pkgs/misc/themes/adwaita-qt/default.nix
diff --git a/pkgs/misc/themes/albatross/default.nix b/nixpkgs/pkgs/misc/themes/albatross/default.nix
index 14fe0f21d80e..14fe0f21d80e 100644
--- a/pkgs/misc/themes/albatross/default.nix
+++ b/nixpkgs/pkgs/misc/themes/albatross/default.nix
diff --git a/pkgs/misc/themes/arc-kde/default.nix b/nixpkgs/pkgs/misc/themes/arc-kde/default.nix
index 42ff954a46ba..42ff954a46ba 100644
--- a/pkgs/misc/themes/arc-kde/default.nix
+++ b/nixpkgs/pkgs/misc/themes/arc-kde/default.nix
diff --git a/pkgs/misc/themes/arc/default.nix b/nixpkgs/pkgs/misc/themes/arc/default.nix
index da12255e91ee..da12255e91ee 100644
--- a/pkgs/misc/themes/arc/default.nix
+++ b/nixpkgs/pkgs/misc/themes/arc/default.nix
diff --git a/pkgs/misc/themes/blackbird/default.nix b/nixpkgs/pkgs/misc/themes/blackbird/default.nix
index 4b7702ed6359..4b7702ed6359 100644
--- a/pkgs/misc/themes/blackbird/default.nix
+++ b/nixpkgs/pkgs/misc/themes/blackbird/default.nix
diff --git a/pkgs/misc/themes/clearlooks-phenix/default.nix b/nixpkgs/pkgs/misc/themes/clearlooks-phenix/default.nix
index daeb7d7ad36d..daeb7d7ad36d 100644
--- a/pkgs/misc/themes/clearlooks-phenix/default.nix
+++ b/nixpkgs/pkgs/misc/themes/clearlooks-phenix/default.nix
diff --git a/pkgs/misc/themes/e17gtk/default.nix b/nixpkgs/pkgs/misc/themes/e17gtk/default.nix
index f0bb2bf729dc..f0bb2bf729dc 100644
--- a/pkgs/misc/themes/e17gtk/default.nix
+++ b/nixpkgs/pkgs/misc/themes/e17gtk/default.nix
diff --git a/pkgs/misc/themes/equilux-theme/default.nix b/nixpkgs/pkgs/misc/themes/equilux-theme/default.nix
index 66e886303421..66e886303421 100644
--- a/pkgs/misc/themes/equilux-theme/default.nix
+++ b/nixpkgs/pkgs/misc/themes/equilux-theme/default.nix
diff --git a/pkgs/misc/themes/gnome-breeze/default.nix b/nixpkgs/pkgs/misc/themes/gnome-breeze/default.nix
index 200cc4bae051..200cc4bae051 100644
--- a/pkgs/misc/themes/gnome-breeze/default.nix
+++ b/nixpkgs/pkgs/misc/themes/gnome-breeze/default.nix
diff --git a/pkgs/misc/themes/gtk2/gtk-engine-bluecurve/default.nix b/nixpkgs/pkgs/misc/themes/gtk2/gtk-engine-bluecurve/default.nix
index 99ca221f5ba2..99ca221f5ba2 100644
--- a/pkgs/misc/themes/gtk2/gtk-engine-bluecurve/default.nix
+++ b/nixpkgs/pkgs/misc/themes/gtk2/gtk-engine-bluecurve/default.nix
diff --git a/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix b/nixpkgs/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix
index 9acb7b25a0dd..9acb7b25a0dd 100644
--- a/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix
+++ b/nixpkgs/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix
diff --git a/pkgs/misc/themes/gtk2/gtk-engines/default.nix b/nixpkgs/pkgs/misc/themes/gtk2/gtk-engines/default.nix
index 966190a5e768..966190a5e768 100644
--- a/pkgs/misc/themes/gtk2/gtk-engines/default.nix
+++ b/nixpkgs/pkgs/misc/themes/gtk2/gtk-engines/default.nix
diff --git a/pkgs/misc/themes/jade1/default.nix b/nixpkgs/pkgs/misc/themes/jade1/default.nix
index e6096ef829d0..e6096ef829d0 100644
--- a/pkgs/misc/themes/jade1/default.nix
+++ b/nixpkgs/pkgs/misc/themes/jade1/default.nix
diff --git a/pkgs/misc/themes/kde2/default.nix b/nixpkgs/pkgs/misc/themes/kde2/default.nix
index 91584bfa1fe3..91584bfa1fe3 100644
--- a/pkgs/misc/themes/kde2/default.nix
+++ b/nixpkgs/pkgs/misc/themes/kde2/default.nix
diff --git a/pkgs/misc/themes/numix-solarized/default.nix b/nixpkgs/pkgs/misc/themes/numix-solarized/default.nix
index 3c81e4308ca9..3c81e4308ca9 100644
--- a/pkgs/misc/themes/numix-solarized/default.nix
+++ b/nixpkgs/pkgs/misc/themes/numix-solarized/default.nix
diff --git a/pkgs/misc/themes/numix-sx/default.nix b/nixpkgs/pkgs/misc/themes/numix-sx/default.nix
index 9001ad9e5a3a..9001ad9e5a3a 100644
--- a/pkgs/misc/themes/numix-sx/default.nix
+++ b/nixpkgs/pkgs/misc/themes/numix-sx/default.nix
diff --git a/pkgs/misc/themes/numix/default.nix b/nixpkgs/pkgs/misc/themes/numix/default.nix
index 4fb412481095..4fb412481095 100644
--- a/pkgs/misc/themes/numix/default.nix
+++ b/nixpkgs/pkgs/misc/themes/numix/default.nix
diff --git a/pkgs/misc/themes/obsidian2/default.nix b/nixpkgs/pkgs/misc/themes/obsidian2/default.nix
index 8a8e88ff6f96..8a8e88ff6f96 100644
--- a/pkgs/misc/themes/obsidian2/default.nix
+++ b/nixpkgs/pkgs/misc/themes/obsidian2/default.nix
diff --git a/pkgs/misc/themes/onestepback/default.nix b/nixpkgs/pkgs/misc/themes/onestepback/default.nix
index 5e4f8ffa3d46..5e4f8ffa3d46 100644
--- a/pkgs/misc/themes/onestepback/default.nix
+++ b/nixpkgs/pkgs/misc/themes/onestepback/default.nix
diff --git a/pkgs/misc/themes/orion/default.nix b/nixpkgs/pkgs/misc/themes/orion/default.nix
index 9ba8cd368cf7..9ba8cd368cf7 100644
--- a/pkgs/misc/themes/orion/default.nix
+++ b/nixpkgs/pkgs/misc/themes/orion/default.nix
diff --git a/pkgs/misc/themes/paper/default.nix b/nixpkgs/pkgs/misc/themes/paper/default.nix
index 8bcb48812a3e..8bcb48812a3e 100644
--- a/pkgs/misc/themes/paper/default.nix
+++ b/nixpkgs/pkgs/misc/themes/paper/default.nix
diff --git a/pkgs/misc/themes/qtcurve/default.nix b/nixpkgs/pkgs/misc/themes/qtcurve/default.nix
index 54715c01a9ee..54715c01a9ee 100644
--- a/pkgs/misc/themes/qtcurve/default.nix
+++ b/nixpkgs/pkgs/misc/themes/qtcurve/default.nix
diff --git a/pkgs/misc/themes/solarc/default.nix b/nixpkgs/pkgs/misc/themes/solarc/default.nix
index 55cd6e1dac04..55cd6e1dac04 100644
--- a/pkgs/misc/themes/solarc/default.nix
+++ b/nixpkgs/pkgs/misc/themes/solarc/default.nix
diff --git a/pkgs/misc/themes/vertex/default.nix b/nixpkgs/pkgs/misc/themes/vertex/default.nix
index 06d42da79362..06d42da79362 100644
--- a/pkgs/misc/themes/vertex/default.nix
+++ b/nixpkgs/pkgs/misc/themes/vertex/default.nix
diff --git a/pkgs/misc/tmux-plugins/default.nix b/nixpkgs/pkgs/misc/tmux-plugins/default.nix
index 6c85f9a6329f..6c85f9a6329f 100644
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/nixpkgs/pkgs/misc/tmux-plugins/default.nix
diff --git a/pkgs/misc/tw-rs/default.nix b/nixpkgs/pkgs/misc/tw-rs/default.nix
index 50fa1a9ef0ee..50fa1a9ef0ee 100644
--- a/pkgs/misc/tw-rs/default.nix
+++ b/nixpkgs/pkgs/misc/tw-rs/default.nix
diff --git a/pkgs/misc/uboot/default.nix b/nixpkgs/pkgs/misc/uboot/default.nix
index 6fe1a2081d22..6fe1a2081d22 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 fb3b98f478e6..fb3b98f478e6 100644
--- a/pkgs/misc/uboot/nanonote.nix
+++ b/nixpkgs/pkgs/misc/uboot/nanonote.nix
diff --git a/pkgs/misc/uboot/rock64-fdt-dtc-compatibility.patch b/nixpkgs/pkgs/misc/uboot/rock64-fdt-dtc-compatibility.patch
index 92725cac5b45..92725cac5b45 100644
--- a/pkgs/misc/uboot/rock64-fdt-dtc-compatibility.patch
+++ b/nixpkgs/pkgs/misc/uboot/rock64-fdt-dtc-compatibility.patch
diff --git a/pkgs/misc/uboot/rock64.nix b/nixpkgs/pkgs/misc/uboot/rock64.nix
index e49b4b519f1c..e49b4b519f1c 100644
--- a/pkgs/misc/uboot/rock64.nix
+++ b/nixpkgs/pkgs/misc/uboot/rock64.nix
diff --git a/pkgs/misc/uboot/rockpro64.nix b/nixpkgs/pkgs/misc/uboot/rockpro64.nix
index 45f6d5de2a9a..45f6d5de2a9a 100644
--- a/pkgs/misc/uboot/rockpro64.nix
+++ b/nixpkgs/pkgs/misc/uboot/rockpro64.nix
diff --git a/pkgs/misc/urbit/default.nix b/nixpkgs/pkgs/misc/urbit/default.nix
index e10fa1b06b78..e10fa1b06b78 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 cfdd629369c0..cfdd629369c0 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 b797f49df9e0..b797f49df9e0 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 20cbbf275c3a..20cbbf275c3a 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 edfafc4e9d37..edfafc4e9d37 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 033a02a65848..033a02a65848 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 72c928d1a971..72c928d1a971 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/update.py b/nixpkgs/pkgs/misc/vim-plugins/update.py
index 8a8e20da8d7e..8a8e20da8d7e 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 981965b323b9..981965b323b9 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 14332c700780..14332c700780 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 4263481461f1..4263481461f1 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 93ca9bc129b5..93ca9bc129b5 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 0ddbeaae6be1..0ddbeaae6be1 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 a60dad9b7b70..a60dad9b7b70 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 f5eb08d78a5d..f5eb08d78a5d 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 c2d8a10f340a..c2d8a10f340a 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 00ef77553242..00ef77553242 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 ec513c5a7b92..ec513c5a7b92 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 65130da9095b..65130da9095b 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/update_installed_exts.sh b/nixpkgs/pkgs/misc/vscode-extensions/update_installed_exts.sh
index fdbc14fb2642..fdbc14fb2642 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 82d39dbfec63..82d39dbfec63 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 7a8a097b8d42..7a8a097b8d42 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 c8cda8482bf1..c8cda8482bf1 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 a75c132b55a2..a75c132b55a2 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 925001567f79..925001567f79 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 81df09eba176..81df09eba176 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 f67ca2e50791..f67ca2e50791 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 93b6f4a62097..93b6f4a62097 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 5cf8c753aec3..5cf8c753aec3 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 e9e34d19a315..e9e34d19a315 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 3aadabe50882..3aadabe50882 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 1df9eb385625..1df9eb385625 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 aa73c7f86c40..aa73c7f86c40 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 174f9478633c..174f9478633c 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/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-sdk/default.nix
index 2e3ae22e0b23..2e3ae22e0b23 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 b0d5915fc1fc..b0d5915fc1fc 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 03c800b8dae5..03c800b8dae5 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 c111492f2b3d..c111492f2b3d 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 fbd977f8552d..fbd977f8552d 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 ed9bdbd912db..ed9bdbd912db 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 5c6d54aeb9c3..5c6d54aeb9c3 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 ad51f1df2bcd..ad51f1df2bcd 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 7fd32a64fe57..7fd32a64fe57 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 fd9df8129407..fd9df8129407 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 761ff3ea9252..761ff3ea9252 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 4b82209f176c..4b82209f176c 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 29aa3d64cb08..29aa3d64cb08 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 a1cbb72b9176..a1cbb72b9176 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 6ebb470145d5..6ebb470145d5 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 add51a61d3d3..add51a61d3d3 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 df5f6b7b8fd6..df5f6b7b8fd6 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 2ee80d702646..2ee80d702646 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 7002f82fe561..7002f82fe561 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 7b19194be96e..7b19194be96e 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 edc2e759a29e..edc2e759a29e 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 1ec6c6332cf4..1ec6c6332cf4 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 7c5b90f95ed7..7c5b90f95ed7 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 75a00acac493..75a00acac493 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 2d5520b9bf9c..2d5520b9bf9c 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 e04142b8b11e..e04142b8b11e 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 f335a6c11548..f335a6c11548 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 318e2728fc2e..318e2728fc2e 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 0cbd7d81b902..0cbd7d81b902 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 ebeb3ef08845..ebeb3ef08845 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 4a0180dda7ae..4a0180dda7ae 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 256781f61b11..256781f61b11 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 043c7b0bc70d..043c7b0bc70d 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 20168d24dd71..20168d24dd71 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 7e1dc5309b1d..7e1dc5309b1d 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 14c69b84eb41..14c69b84eb41 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 b2d8522f3264..b2d8522f3264 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 6d3bd103811d..6d3bd103811d 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 8706d22be19b..8706d22be19b 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 ddadf1f3940b..ddadf1f3940b 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 b24d94b9d70d..b24d94b9d70d 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 f0394a20c2cc..f0394a20c2cc 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 ab294b143d39..ab294b143d39 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 eed7982e9d8c..eed7982e9d8c 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 bf367a3cabb3..bf367a3cabb3 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 b2ef3374ca27..b2ef3374ca27 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 ac33a24a8b4e..ac33a24a8b4e 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 46e9e592ddc6..46e9e592ddc6 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 0532c88b66b9..0532c88b66b9 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 4fd0ab8a7fb2..4fd0ab8a7fb2 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 650c6415defc..650c6415defc 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 f3c7558cfc62..f3c7558cfc62 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 bd219ae434c0..bd219ae434c0 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 8bd45aa008b9..8bd45aa008b9 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 f17ed785360d..f17ed785360d 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 feee054c2ac8..feee054c2ac8 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 a7cedaaea114..a7cedaaea114 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 4ad9ba9ad104..4ad9ba9ad104 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 28dcbdcb4a2a..28dcbdcb4a2a 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 50c6a983fe4d..50c6a983fe4d 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 5668c376130e..5668c376130e 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 2b45fbdb45e2..2b45fbdb45e2 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 5b2322915dc9..5b2322915dc9 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 39c903a2e7b9..39c903a2e7b9 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 14d7a5e3b32d..14d7a5e3b32d 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 a2f912ca5782..a2f912ca5782 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 aaa3a1ebe327..aaa3a1ebe327 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/binutils/default.nix b/nixpkgs/pkgs/os-specific/darwin/binutils/default.nix
index 9f9a0c747247..9f9a0c747247 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/apfs.patch b/nixpkgs/pkgs/os-specific/darwin/cctools/apfs.patch
index 8c6b3c0d2738..8c6b3c0d2738 100644
--- a/pkgs/os-specific/darwin/cctools/apfs.patch
+++ b/nixpkgs/pkgs/os-specific/darwin/cctools/apfs.patch
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 fc87f69ac32d..fc87f69ac32d 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 265d0d304771..265d0d304771 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 ff8f3eb5e265..ff8f3eb5e265 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/cf-private/default.nix b/nixpkgs/pkgs/os-specific/darwin/cf-private/default.nix
index eb5f651a1a08..eb5f651a1a08 100644
--- a/pkgs/os-specific/darwin/cf-private/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/cf-private/default.nix
diff --git a/pkgs/os-specific/darwin/cf-private/setup-hook.sh b/nixpkgs/pkgs/os-specific/darwin/cf-private/setup-hook.sh
index ae9ed5d15845..ae9ed5d15845 100644
--- a/pkgs/os-specific/darwin/cf-private/setup-hook.sh
+++ b/nixpkgs/pkgs/os-specific/darwin/cf-private/setup-hook.sh
diff --git a/pkgs/os-specific/darwin/chunkwm/default.nix b/nixpkgs/pkgs/os-specific/darwin/chunkwm/default.nix
index 9dd1205c1146..9dd1205c1146 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 846831d0a879..846831d0a879 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 a9051fd1279f..a9051fd1279f 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 46ba68281868..46ba68281868 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 190c0ae22131..190c0ae22131 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 0ab6a4157075..0ab6a4157075 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 3ff03aace4ee..3ff03aace4ee 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 fb7bb12a493f..fb7bb12a493f 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 3c0aaa81eb61..3c0aaa81eb61 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 3076392ecb26..3076392ecb26 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 eafce2ab4a46..eafce2ab4a46 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 e68e77f55afe..e68e77f55afe 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 0b59ecb2299e..0b59ecb2299e 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 75f1113e9f08..75f1113e9f08 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 d1df820615df..d1df820615df 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 fa3d4284e597..fa3d4284e597 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 81f4ab2bd9e9..81f4ab2bd9e9 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 960e0677da1e..960e0677da1e 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 404e752c279e..404e752c279e 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/qes/default.nix b/nixpkgs/pkgs/os-specific/darwin/qes/default.nix
index aa7bfb5c3be7..aa7bfb5c3be7 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 631c59523e2a..631c59523e2a 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 713847313c2c..713847313c2c 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 e6624487740b..e6624487740b 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 b18c603a911b..b18c603a911b 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 6fedf0a451e3..6fedf0a451e3 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 6f7caa8ec02c..6f7caa8ec02c 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 bd143b6071ba..bd143b6071ba 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 4044ee4d0ddc..4044ee4d0ddc 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 fa6edf98b3de..fa6edf98b3de 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 4fef1388764d..4fef1388764d 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/xcode/default.nix b/nixpkgs/pkgs/os-specific/darwin/xcode/default.nix
index 62785f34fe84..62785f34fe84 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 bb9dc0a03b5f..bb9dc0a03b5f 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 ce21887f19f8..ce21887f19f8 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 bd12373da884..bd12373da884 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 37de98780b69..37de98780b69 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 99d1cf38f0ac..99d1cf38f0ac 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 ce47932587cf..ce47932587cf 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 67c5ff140874..67c5ff140874 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/alienfx/default.nix b/nixpkgs/pkgs/os-specific/linux/alienfx/default.nix
index d04e7b8fbeb0..d04e7b8fbeb0 100644
--- a/pkgs/os-specific/linux/alienfx/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/alienfx/default.nix
diff --git a/pkgs/os-specific/linux/alienfx/unistd.patch b/nixpkgs/pkgs/os-specific/linux/alienfx/unistd.patch
index 546a27892f0d..546a27892f0d 100644
--- a/pkgs/os-specific/linux/alienfx/unistd.patch
+++ b/nixpkgs/pkgs/os-specific/linux/alienfx/unistd.patch
diff --git a/pkgs/os-specific/linux/alsa-firmware/default.nix b/nixpkgs/pkgs/os-specific/linux/alsa-firmware/default.nix
index 53fcf7d68433..53fcf7d68433 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 b17df9a492e5..b17df9a492e5 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 8dcddf4baf9b..8dcddf4baf9b 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 d3e7dd5fa5da..d3e7dd5fa5da 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 2956b107aa71..2956b107aa71 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 769b6ecd9bf2..769b6ecd9bf2 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 14b10e6752bb..14b10e6752bb 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 09c430bcd53b..09c430bcd53b 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 b72944a49eb1..b72944a49eb1 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 ecde6401ac18..ecde6401ac18 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 20f429757a51..20f429757a51 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 0091c471680c..0091c471680c 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 ab47bacb8228..ab47bacb8228 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 64ed110b2a3f..64ed110b2a3f 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 6415cc635d53..6415cc635d53 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 b03636d6f7f6..b03636d6f7f6 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/default.nix b/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix
index ccad9795301d..ccad9795301d 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 f6ad8e2c03b6..f6ad8e2c03b6 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 b79054d44065..b79054d44065 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 22e43fc0c7b6..22e43fc0c7b6 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 20c3bc8a169b..20c3bc8a169b 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 bdf70b4ccdc4..bdf70b4ccdc4 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 c6598835133e..c6598835133e 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 3e4e8d6499a0..3e4e8d6499a0 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 cb86f5aff276..cb86f5aff276 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 8a6c42cdb1fc..8a6c42cdb1fc 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 1e7209ed5ed1..1e7209ed5ed1 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 28820790e492..28820790e492 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 8bd24b1d022b..8bd24b1d022b 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 5d002bf72eac..5d002bf72eac 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 46099d9c9595..46099d9c9595 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 4a569e1e1c3d..4a569e1e1c3d 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 38e2fa9bd344..38e2fa9bd344 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 cb240ba16953..cb240ba16953 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 58c6a7167e30..58c6a7167e30 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 d7d25e696642..d7d25e696642 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/bbswitch/default.nix b/nixpkgs/pkgs/os-specific/linux/bbswitch/default.nix
index 4b9148600686..4b9148600686 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 014ebe80cdcc..014ebe80cdcc 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 1c422635f4fe..1c422635f4fe 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 187bb3aadd00..187bb3aadd00 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/beegfs/default.nix b/nixpkgs/pkgs/os-specific/linux/beegfs/default.nix
index 076c19cf400d..076c19cf400d 100644
--- a/pkgs/os-specific/linux/beegfs/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/beegfs/default.nix
diff --git a/pkgs/os-specific/linux/beegfs/kernel-module.nix b/nixpkgs/pkgs/os-specific/linux/beegfs/kernel-module.nix
index 286252b927b1..286252b927b1 100644
--- a/pkgs/os-specific/linux/beegfs/kernel-module.nix
+++ b/nixpkgs/pkgs/os-specific/linux/beegfs/kernel-module.nix
diff --git a/pkgs/os-specific/linux/blcr/default.nix b/nixpkgs/pkgs/os-specific/linux/blcr/default.nix
index 626e978f1f16..626e978f1f16 100644
--- a/pkgs/os-specific/linux/blcr/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/blcr/default.nix
diff --git a/pkgs/os-specific/linux/blktrace/default.nix b/nixpkgs/pkgs/os-specific/linux/blktrace/default.nix
index 4ae449c19aa8..4ae449c19aa8 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/bluez-5.37-obexd_without_systemd-1.patch b/nixpkgs/pkgs/os-specific/linux/bluez/bluez-5.37-obexd_without_systemd-1.patch
index 749787c5b3a7..749787c5b3a7 100644
--- a/pkgs/os-specific/linux/bluez/bluez-5.37-obexd_without_systemd-1.patch
+++ b/nixpkgs/pkgs/os-specific/linux/bluez/bluez-5.37-obexd_without_systemd-1.patch
diff --git a/pkgs/os-specific/linux/bluez/default.nix b/nixpkgs/pkgs/os-specific/linux/bluez/default.nix
index be43d23d6115..be43d23d6115 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 0853bcea9167..0853bcea9167 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 f57fb1310c67..f57fb1310c67 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 ac444c28d75d..ac444c28d75d 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 87355fbcc2ec..87355fbcc2ec 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 0c6ffc471ad6..0c6ffc471ad6 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 c9149bfec386..c9149bfec386 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/default.nix b/nixpkgs/pkgs/os-specific/linux/bridge-utils/default.nix
index 2725a5909b7b..2725a5909b7b 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/broadcom-sta/default.nix b/nixpkgs/pkgs/os-specific/linux/broadcom-sta/default.nix
index 93ac3fe5b745..93ac3fe5b745 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 f93e3f1d3a3f..f93e3f1d3a3f 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 cfa16075409b..cfa16075409b 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 aebb46365195..aebb46365195 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 a779f8c84cfd..a779f8c84cfd 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 8abc73db4db1..8abc73db4db1 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 523fa291d525..523fa291d525 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 566680a09140..566680a09140 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 20e8a9ae49d2..20e8a9ae49d2 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 8f04a737cab8..8f04a737cab8 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 763797294307..763797294307 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 27fa40887ed2..27fa40887ed2 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 2d356b66b3ae..2d356b66b3ae 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 b2d696bfd73f..b2d696bfd73f 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 7270877c52e4..7270877c52e4 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 c2d82ebc487a..c2d82ebc487a 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 d77539fb89ed..d77539fb89ed 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 0c32c3f5e62a..0c32c3f5e62a 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 616c99c8f46a..616c99c8f46a 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 6ba86036a52a..6ba86036a52a 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 674b695b1eee..674b695b1eee 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 2caf52f3c0a3..2caf52f3c0a3 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 6c927ae93afb..6c927ae93afb 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/cifs-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/cifs-utils/default.nix
index ba66bd309bc3..ba66bd309bc3 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 0f24b1a18e9b..0f24b1a18e9b 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 1af37c2168d1..1af37c2168d1 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 755e88b46cbc..755e88b46cbc 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 d813376da8e5..d813376da8e5 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 32905b8ec39f..32905b8ec39f 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 3f9ff3e4a820..3f9ff3e4a820 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 04da31176da2..04da31176da2 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 0116ed9eab0c..0116ed9eab0c 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 1b307da8cb80..1b307da8cb80 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 5791145d52af..5791145d52af 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/cramfsswap/builder.sh b/nixpkgs/pkgs/os-specific/linux/cramfsswap/builder.sh
index 51a5b11dda69..51a5b11dda69 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 d183bb25cb56..d183bb25cb56 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 940913d6a6c8..940913d6a6c8 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 0821fbdc15cf..0821fbdc15cf 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 c146e18f68d5..c146e18f68d5 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 9c621d28ed29..9c621d28ed29 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 1504bf3e1511..1504bf3e1511 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 880b620d87cf..880b620d87cf 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/deepin-anything/default.nix b/nixpkgs/pkgs/os-specific/linux/deepin-anything/default.nix
index 4139cc153cdd..4139cc153cdd 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/devmem2/default.nix b/nixpkgs/pkgs/os-specific/linux/devmem2/default.nix
index cd1400b41fc2..cd1400b41fc2 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/directvnc/default.nix b/nixpkgs/pkgs/os-specific/linux/directvnc/default.nix
index e8c1e9bfe5e5..e8c1e9bfe5e5 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 46ebc923e3b2..46ebc923e3b2 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 2ea939ccdb09..2ea939ccdb09 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 3e62e20c3150..3e62e20c3150 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 a4ec902f762d..a4ec902f762d 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 129ccb304564..129ccb304564 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 f91a7fb18aa0..f91a7fb18aa0 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 534e57354474..534e57354474 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 5a81dad0cc90..5a81dad0cc90 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 13614493f610..13614493f610 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 5e990511eed7..5e990511eed7 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 8f0201100f72..8f0201100f72 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 936dbf719a87..936dbf719a87 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 63b766b21a5c..63b766b21a5c 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 38ef803d8e52..38ef803d8e52 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 9725ea66dd43..9725ea66dd43 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 9d92575b6687..9d92575b6687 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 eabd08485536..eabd08485536 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 887c09691eb8..887c09691eb8 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/ena/default.nix b/nixpkgs/pkgs/os-specific/linux/ena/default.nix
index 495cd49e3f48..495cd49e3f48 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 9d836b30dc76..9d836b30dc76 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 b8fec2f416a2..b8fec2f416a2 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 00183f183326..00183f183326 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 036cd3f28a1b..036cd3f28a1b 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 28a92d31eaa2..28a92d31eaa2 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 d65018c600ec..d65018c600ec 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 94ea85f433d9..94ea85f433d9 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 defb45d7a861..defb45d7a861 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/ffado/default.nix b/nixpkgs/pkgs/os-specific/linux/ffado/default.nix
index 3d2c6ae6dae2..3d2c6ae6dae2 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 7e360932613f..7e360932613f 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 28528f48efb3..28528f48efb3 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 0e6576c44a80..0e6576c44a80 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 8aa78e65dec1..8aa78e65dec1 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 578812e0ad0b..578812e0ad0b 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 1cc0e7ae4ca7..1cc0e7ae4ca7 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 2637beb517a3..2637beb517a3 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 a57a6f1d70f6..a57a6f1d70f6 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 8927e1a28e7c..8927e1a28e7c 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 5f8f6c542521..5f8f6c542521 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 a1a15bab0fea..a1a15bab0fea 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 4903eadef4b5..4903eadef4b5 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 a60417d8e231..a60417d8e231 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 51adef2e7870..51adef2e7870 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 6c4b6b62a0cd..6c4b6b62a0cd 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/fwupdate/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/fwupdate/default.nix
index 5b14546c90fd..5b14546c90fd 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 b8588ef2b11a..b8588ef2b11a 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 372be2d71f2c..372be2d71f2c 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 b60ce6f1b4af..b60ce6f1b4af 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 e64c4c09ebd9..e64c4c09ebd9 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 eb218f36eb44..eb218f36eb44 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 e12aeeb0cdb8..e12aeeb0cdb8 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 4685f6757179..4685f6757179 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 af0c07d10596..af0c07d10596 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 d8d4c37fd886..d8d4c37fd886 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 eea6f2893f22..eea6f2893f22 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 673ef686e488..673ef686e488 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 2c9db47539f7..2c9db47539f7 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 0a6364f07df5..0a6364f07df5 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 82ce6d123953..82ce6d123953 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 8a2a64149496..8a2a64149496 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 6402b5c69d82..6402b5c69d82 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 45cb775a0ae3..45cb775a0ae3 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 a091b2f17c5e..a091b2f17c5e 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 da787d84d79d..da787d84d79d 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 8622dc001a87..8622dc001a87 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 b7f47f12b15b..b7f47f12b15b 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 915431c0cb1f..915431c0cb1f 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 f10fa6a33b85..f10fa6a33b85 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 afb04306428a..afb04306428a 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 f829f1da424e..f829f1da424e 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 f48e528b486d..f48e528b486d 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 8ff40f34f938..8ff40f34f938 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 1d41a26b0a4d..1d41a26b0a4d 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 147bcb439fb8..147bcb439fb8 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 7c4bd77fae07..7c4bd77fae07 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/fxload/default.nix b/nixpkgs/pkgs/os-specific/linux/fxload/default.nix
index 61bd2a229ab6..61bd2a229ab6 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 9fc052c5ac1b..9fc052c5ac1b 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 88358038bc7e..88358038bc7e 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 942cafd03435..942cafd03435 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 22ecad187d62..22ecad187d62 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 fc308285dd6d..fc308285dd6d 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 d56253c6cedd..d56253c6cedd 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 7f64ed227719..7f64ed227719 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 acafa0376f5c..acafa0376f5c 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 27b85fbfc89a..27b85fbfc89a 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 911854384162..911854384162 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 53924a782df7..53924a782df7 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 37867817bf63..37867817bf63 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 542d99eeabe8..542d99eeabe8 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/hibernate/default.nix b/nixpkgs/pkgs/os-specific/linux/hibernate/default.nix
index 15bdabcc3dc8..15bdabcc3dc8 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 cdbacc86bafa..cdbacc86bafa 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 24de1637d3ce..24de1637d3ce 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 ae296b955ac8..ae296b955ac8 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 7629a20473b2..7629a20473b2 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 dfca87e27165..dfca87e27165 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 f89747dc200d..f89747dc200d 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 5b061183356c..5b061183356c 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 ac5f9fc5ba30..ac5f9fc5ba30 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 9e9b162d9e85..9e9b162d9e85 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 2f4511bcbc47..2f4511bcbc47 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 b9390d1d5893..b9390d1d5893 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 76ec9be27985..76ec9be27985 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 6de3b19afd7e..6de3b19afd7e 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 2d27570a5786..2d27570a5786 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 cd0fc01384bc..cd0fc01384bc 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-ocl/default.nix b/nixpkgs/pkgs/os-specific/linux/intel-ocl/default.nix
index 38069981723d..38069981723d 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/iomelt/default.nix b/nixpkgs/pkgs/os-specific/linux/iomelt/default.nix
index 932b81438982..932b81438982 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 c14d9f146eb0..c14d9f146eb0 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 e2ded7a8fd0c..e2ded7a8fd0c 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 1e53112d360d..1e53112d360d 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 90503c21c04b..90503c21c04b 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 00c23c6cac14..00c23c6cac14 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/default.nix b/nixpkgs/pkgs/os-specific/linux/ipsec-tools/default.nix
index 0aa074b4df8f..0aa074b4df8f 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 16b80c36d6a5..16b80c36d6a5 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 c831c14031a7..c831c14031a7 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 cf06ff353253..cf06ff353253 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 a9be26a20262..a9be26a20262 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/build-ninfod-with-openssl.patch b/nixpkgs/pkgs/os-specific/linux/iputils/build-ninfod-with-openssl.patch
index 7ce1b4f527ec..7ce1b4f527ec 100644
--- a/pkgs/os-specific/linux/iputils/build-ninfod-with-openssl.patch
+++ b/nixpkgs/pkgs/os-specific/linux/iputils/build-ninfod-with-openssl.patch
diff --git a/pkgs/os-specific/linux/iputils/default.nix b/nixpkgs/pkgs/os-specific/linux/iputils/default.nix
index 57eb09e40cfc..57eb09e40cfc 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 0e99dd976c72..0e99dd976c72 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 e606e3db6ee6..e606e3db6ee6 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 c115eab1503e..c115eab1503e 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 387792b86313..387792b86313 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 1ba463d1e9a6..1ba463d1e9a6 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 6bcc548ba521..6bcc548ba521 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 e037ad98226d..e037ad98226d 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 fe5436625e87..fe5436625e87 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 8d170583a6cd..8d170583a6cd 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 0dd0eeed616f..0dd0eeed616f 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 617dad8bdddc..617dad8bdddc 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 a37e65f8cb50..a37e65f8cb50 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 32c9f6906806..32c9f6906806 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 c9405a56721d..c9405a56721d 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 44a63c9f1ece..44a63c9f1ece 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 1e9b1c276d0c..1e9b1c276d0c 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 9b582cac7153..9b582cac7153 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 67e8b19e23bd..67e8b19e23bd 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 70d0f944c2a0..70d0f944c2a0 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 855f854b111d..855f854b111d 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 38cc0532ba97..38cc0532ba97 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 8f2418c9efce..8f2418c9efce 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 6f0904cbce99..6f0904cbce99 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 6d48fde6beef..6d48fde6beef 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 5bef5633aa03..5bef5633aa03 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.patch b/nixpkgs/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions.patch
index 205497aee2da..205497aee2da 100644
--- a/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions.patch
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions.patch
diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/nixpkgs/pkgs/os-specific/linux/kernel/generate-config.pl
index f886fcfdc358..f886fcfdc358 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 527811c2b8d6..527811c2b8d6 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 47ae77a5a54d..47ae77a5a54d 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 79ee27c52b50..79ee27c52b50 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 d3d2e2728a2d..d3d2e2728a2d 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 b9d05c9fe6e8..b9d05c9fe6e8 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 1e3da9085196..1e3da9085196 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 d611e4cf71e6..d611e4cf71e6 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.1.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.1.nix
index e0e64fdc5d4e..e0e64fdc5d4e 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.1.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.1.nix
diff --git a/pkgs/os-specific/linux/kernel/linux-5.2.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.2.nix
index 094c5abf2442..094c5abf2442 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.2.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.2.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 df741d9a029b..df741d9a029b 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 5eb050cbdff9..5eb050cbdff9 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 e53c3ceb5c46..e53c3ceb5c46 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 ad933ff63a7a..ad933ff63a7a 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 d2e1a35cb2e6..d2e1a35cb2e6 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 d8b9fc2a61e1..d8b9fc2a61e1 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 59b406a91eec..59b406a91eec 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/manual-config.nix b/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix
index 7a663fca6948..7a663fca6948 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 58a9191989ae..58a9191989ae 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 e5e3ee283fff..e5e3ee283fff 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 f6061b60667a..f6061b60667a 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 e941cd4ea413..e941cd4ea413 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 1e5c987d508b..1e5c987d508b 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 1328b9cee3c9..1328b9cee3c9 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/tag-hardened.patch b/nixpkgs/pkgs/os-specific/linux/kernel/tag-hardened.patch
index ff8a3a127973..ff8a3a127973 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.sh b/nixpkgs/pkgs/os-specific/linux/kernel/update.sh
index 7a86b05dafca..7a86b05dafca 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 8adb862a265f..8adb862a265f 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/default.nix b/nixpkgs/pkgs/os-specific/linux/keyutils/default.nix
index 1d9497a7eddf..1d9497a7eddf 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 8cae61d56a92..8cae61d56a92 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 d3e55fc8731d..d3e55fc8731d 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 f01f3b6a4ec3..f01f3b6a4ec3 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 266c94fd8c84..266c94fd8c84 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 07ab0427b226..07ab0427b226 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 afa8867dd07e..afa8867dd07e 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 69dbf479f9f1..69dbf479f9f1 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 433506e5c39e..433506e5c39e 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/module-dir.patch b/nixpkgs/pkgs/os-specific/linux/kmod/module-dir.patch
index f7432e3756e9..f7432e3756e9 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 0fff816eac7b..0fff816eac7b 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 b70a750180e2..b70a750180e2 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 f738b9f6da5f..f738b9f6da5f 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 93d2ac8b0312..93d2ac8b0312 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 0c333feab1c1..0c333feab1c1 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 28027fd4510a..28027fd4510a 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 949c8135df7b..949c8135df7b 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 018f8c624350..018f8c624350 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 a23c0cb09269..a23c0cb09269 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 981e928ba659..981e928ba659 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 87f354aa75d3..87f354aa75d3 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 1e920247a754..1e920247a754 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/libnl/default.nix b/nixpkgs/pkgs/os-specific/linux/libnl/default.nix
index 34d10d3aa5fb..34d10d3aa5fb 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 5dab4b34f466..5dab4b34f466 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 51e1a3220941..51e1a3220941 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 59f5f11d0769..59f5f11d0769 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 f16c241a0a1f..f16c241a0a1f 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 874faf7799b3..874faf7799b3 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 c0c6ad54579c..c0c6ad54579c 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 14c152dc10e9..14c152dc10e9 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 879e85a0c945..879e85a0c945 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 07e5f0bf852b..07e5f0bf852b 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 1856c8861cc4..1856c8861cc4 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 3eaf43631954..3eaf43631954 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 84a0f4a10d5f..84a0f4a10d5f 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 6c644c9482a3..6c644c9482a3 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 0536ba064a3d..0536ba064a3d 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 3c7ceb1270c0..3c7ceb1270c0 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 c215d9401940..c215d9401940 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 34dae105a8dd..34dae105a8dd 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/lsiutil/default.nix b/nixpkgs/pkgs/os-specific/linux/lsiutil/default.nix
index 93cab433c9c6..93cab433c9c6 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 aba907039aca..aba907039aca 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 d4b3f374c5bc..d4b3f374c5bc 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 469096d014d7..469096d014d7 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 1e5aaf5ab5cf..1e5aaf5ab5cf 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/lvm2/purity.patch b/nixpkgs/pkgs/os-specific/linux/lvm2/purity.patch
index d6990dd9caa5..d6990dd9caa5 100644
--- a/pkgs/os-specific/linux/lvm2/purity.patch
+++ b/nixpkgs/pkgs/os-specific/linux/lvm2/purity.patch
diff --git a/pkgs/os-specific/linux/lxc/default.nix b/nixpkgs/pkgs/os-specific/linux/lxc/default.nix
index a8668313465a..a8668313465a 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 16715992d35f..16715992d35f 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 3953ff1915a7..3953ff1915a7 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 c335031f2e56..c335031f2e56 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 0a6fc3c977c8..0a6fc3c977c8 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 9528b9be7f7d..9528b9be7f7d 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 394dbf63f170..394dbf63f170 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 4e0202cebf31..4e0202cebf31 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 cf0366e52d11..cf0366e52d11 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 34f19db524ce..34f19db524ce 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 07d6dcb4a5f7..07d6dcb4a5f7 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 485272b1401b..485272b1401b 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 a29a03734242..a29a03734242 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 b65486cb2fe1..b65486cb2fe1 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 1b5925a55816..1b5925a55816 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 533cd90a2d3c..533cd90a2d3c 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 ac083e545fed..ac083e545fed 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 128f3eac2635..128f3eac2635 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 492a9321a21c..492a9321a21c 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 0e90a0814767..0e90a0814767 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 91e1ae36f709..91e1ae36f709 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 9490bc911819..9490bc911819 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 76e60ec80ff5..76e60ec80ff5 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 bdb52c0c0916..bdb52c0c0916 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 34965540d248..34965540d248 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 dedaac6247d0..dedaac6247d0 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 42f745b02e30..42f745b02e30 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 700bc5cb7f19..700bc5cb7f19 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 718cf4815baf..718cf4815baf 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 303df98d44ae..303df98d44ae 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 b4878ff4eac1..b4878ff4eac1 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 5f425c9685cf..5f425c9685cf 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 48250141e82a..48250141e82a 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 c23eb19a482a..c23eb19a482a 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 8b0b9289327a..8b0b9289327a 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 2db2e12bb961..2db2e12bb961 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 ed84c41001b6..ed84c41001b6 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 97f3dc8b6cf7..97f3dc8b6cf7 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 80f14b568eda..80f14b568eda 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 467d930aaf58..467d930aaf58 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 3a80f4aa1de5..3a80f4aa1de5 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 eeb7b99bbaae..eeb7b99bbaae 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 cfe79d4c0b79..cfe79d4c0b79 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 5420a651c794..5420a651c794 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 6ce5c1205e2d..6ce5c1205e2d 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 02161f7133ce..02161f7133ce 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 4bf1e41bd57b..4bf1e41bd57b 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 bead5f84eac9..bead5f84eac9 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 93cf33979f4b..93cf33979f4b 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 a2644fcbc3fd..a2644fcbc3fd 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 21d32af3ba83..21d32af3ba83 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 cd21899e60e7..cd21899e60e7 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 f4043f700306..f4043f700306 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/openvswitch/default.nix b/nixpkgs/pkgs/os-specific/linux/openvswitch/default.nix
index a2a272f1b3a5..a2a272f1b3a5 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/otpw/default.nix b/nixpkgs/pkgs/os-specific/linux/otpw/default.nix
index a0464e1996a5..a0464e1996a5 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 9354811fd6f3..9354811fd6f3 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 1f2a7d3edf27..1f2a7d3edf27 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 194e47b9e5b0..194e47b9e5b0 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 8293ac0a830a..8293ac0a830a 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 3b23c286e19a..3b23c286e19a 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 5b34a8bc82b5..5b34a8bc82b5 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 29ed9375c2e3..29ed9375c2e3 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 6d9da05da295..6d9da05da295 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 10856bb52c9c..10856bb52c9c 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 48c02be9c389..48c02be9c389 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 190325251c9a..190325251c9a 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 72846e185ebd..72846e185ebd 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 9b9157255142..9b9157255142 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 917652ca6f79..917652ca6f79 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 8fdd2356c30d..8fdd2356c30d 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 11a6bb9910f9..11a6bb9910f9 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 c1500e51ac37..c1500e51ac37 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 6365175290ad..6365175290ad 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 aeb4d78d0ec4..aeb4d78d0ec4 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 ef8e8c7b34a7..ef8e8c7b34a7 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 1155a793b014..1155a793b014 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 75fce129e934..75fce129e934 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 e177b284bbda..e177b284bbda 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 523f7382a2cf..523f7382a2cf 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/default.nix b/nixpkgs/pkgs/os-specific/linux/pktgen/default.nix
index a7bb4a81510d..a7bb4a81510d 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 43f184f384dd..43f184f384dd 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 2092a50041f1..2092a50041f1 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 b314e8db8379..b314e8db8379 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 cd0e277b2c6b..cd0e277b2c6b 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 a7cac46ae6a0..a7cac46ae6a0 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 06ea49034a01..06ea49034a01 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/powerstat/default.nix b/nixpkgs/pkgs/os-specific/linux/powerstat/default.nix
index d25ac0139b78..d25ac0139b78 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 691b216073fd..691b216073fd 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 b9b3fdbaf343..b9b3fdbaf343 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 e4f7d4b3616e..e4f7d4b3616e 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 b8eb27fdd992..b8eb27fdd992 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 1a4919a5d9d4..1a4919a5d9d4 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 aa7d0ec46043..aa7d0ec46043 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 1ed85bc94cb7..1ed85bc94cb7 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 b6c169483393..b6c169483393 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 68e51afdf1bb..68e51afdf1bb 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 f2c87b97c4ff..f2c87b97c4ff 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 81e5a2af9cdf..81e5a2af9cdf 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 36ad73c48d68..36ad73c48d68 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 6acd327ef0ed..6acd327ef0ed 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 3e57bbc11bdc..3e57bbc11bdc 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 ee7325edbe70..ee7325edbe70 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 bd25dc65ec85..bd25dc65ec85 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 8c7b75a881f4..8c7b75a881f4 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 6b6bef29cc36..6b6bef29cc36 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 75716e40daee..75716e40daee 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 41dd3da9d31f..41dd3da9d31f 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 ecaa4e89d49d..ecaa4e89d49d 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 78bcd925aea0..78bcd925aea0 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 57544659e868..57544659e868 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 b1e01f705dcf..b1e01f705dcf 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 f524bee35210..f524bee35210 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 c54d45773428..c54d45773428 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 ca63c5c6a8df..ca63c5c6a8df 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 4be462991223..4be462991223 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 b29b1f639cf7..b29b1f639cf7 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 bd6b84ea73cf..bd6b84ea73cf 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 68fc8a6e0170..68fc8a6e0170 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 2c02ef924c3f..2c02ef924c3f 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 613a7fd51e65..613a7fd51e65 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 0d1ae96068a4..0d1ae96068a4 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 a8d5112c63b9..a8d5112c63b9 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 527c94de46b3..527c94de46b3 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 71d2ee6e80af..71d2ee6e80af 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 10ba1a3c7d07..10ba1a3c7d07 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 4067e5f70e27..4067e5f70e27 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 f2ed3c4a7834..f2ed3c4a7834 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 a7c3bc9758b1..a7c3bc9758b1 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 039d875060a2..039d875060a2 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 15582574ecb0..15582574ecb0 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 6b808f0d6a63..6b808f0d6a63 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 99fd17c27bc9..99fd17c27bc9 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 7d922eae71fc..7d922eae71fc 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 32761970d81c..32761970d81c 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 de12b3719af3..de12b3719af3 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 06c668acc960..06c668acc960 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 449edf481a95..449edf481a95 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 80c5c1f650ba..80c5c1f650ba 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 376ae47ffbe0..376ae47ffbe0 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 c7543aee9337..c7543aee9337 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 3001c8f07c56..3001c8f07c56 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 485de5741d79..485de5741d79 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 485f3d94a73d..485f3d94a73d 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 513503ff98e6..513503ff98e6 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 0a7fb166bd75..0a7fb166bd75 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 e4bffa5d6953..e4bffa5d6953 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 8965b5da4f49..8965b5da4f49 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/syslinux/perl-deps.patch b/nixpkgs/pkgs/os-specific/linux/syslinux/perl-deps.patch
index 82c9820809e1..82c9820809e1 100644
--- a/pkgs/os-specific/linux/syslinux/perl-deps.patch
+++ b/nixpkgs/pkgs/os-specific/linux/syslinux/perl-deps.patch
diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/nixpkgs/pkgs/os-specific/linux/sysstat/default.nix
index e2adcd2cc2a0..e2adcd2cc2a0 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 473fa30b98b4..473fa30b98b4 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 114f4c2444e6..114f4c2444e6 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 3fd8ff07f425..3fd8ff07f425 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 39aa855e3cc5..39aa855e3cc5 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 a29c6152aaa6..a29c6152aaa6 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 b8990484cb98..b8990484cb98 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 fc4b38724a7d..fc4b38724a7d 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 eee640e8a824..eee640e8a824 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 5df7bb827aad..5df7bb827aad 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 328a4a102618..328a4a102618 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 faf47c96a5e6..faf47c96a5e6 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 3c833de8b0c3..3c833de8b0c3 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 48a520f6ec3a..48a520f6ec3a 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 53b6cbc3401a..53b6cbc3401a 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 690eb8b2eabb..690eb8b2eabb 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 880fd61ec2c6..880fd61ec2c6 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 e22263bc2dbd..e22263bc2dbd 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 65b557e45457..65b557e45457 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 b4e584f2979b..b4e584f2979b 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 33dbfe5bf0a7..33dbfe5bf0a7 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/trinity/default.nix b/nixpkgs/pkgs/os-specific/linux/trinity/default.nix
index b855f0547ba0..b855f0547ba0 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 ded9ec0281db..ded9ec0281db 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/uclibc/default.nix b/nixpkgs/pkgs/os-specific/linux/uclibc/default.nix
index c07e063caa71..c07e063caa71 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 29e3fd2e2a8d..29e3fd2e2a8d 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 60bf2b9bc242..60bf2b9bc242 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 484697d42ea9..484697d42ea9 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 c2744c3b42e1..c2744c3b42e1 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 16c7ea5322fa..16c7ea5322fa 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 85ef5208049d..85ef5208049d 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 b323b515c40e..b323b515c40e 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 bf1121ddb659..bf1121ddb659 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 a97cca4dfa76..a97cca4dfa76 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/untie/default.nix b/nixpkgs/pkgs/os-specific/linux/untie/default.nix
index 739bd4471927..739bd4471927 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 14458356a790..14458356a790 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 3df0023bd678..3df0023bd678 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 497b5c191669..497b5c191669 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/usbutils/default.nix b/nixpkgs/pkgs/os-specific/linux/usbutils/default.nix
index 2627286ccffe..2627286ccffe 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 d75c68505efc..d75c68505efc 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 94e5d998cd01..94e5d998cd01 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 0962bd911329..0962bd911329 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 5f38861bf68b..5f38861bf68b 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 1a40ec50c999..1a40ec50c999 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 3b5b08ff084c..3b5b08ff084c 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 2e22b99a95f3..2e22b99a95f3 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 073a6ded998b..073a6ded998b 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 f795d36207a8..f795d36207a8 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 02e08bec7ad7..02e08bec7ad7 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 687bb7647cf8..687bb7647cf8 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 61f487586767..61f487586767 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 891de61c0170..891de61c0170 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 b4997714ceaf..b4997714ceaf 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 7911a2172ba0..7911a2172ba0 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-mtrack/default.nix b/nixpkgs/pkgs/os-specific/linux/xf86-input-mtrack/default.nix
index 2897e9200fd7..2897e9200fd7 100644
--- a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/xf86-input-mtrack/default.nix
diff --git a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix b/nixpkgs/pkgs/os-specific/linux/xf86-input-multitouch/default.nix
index 71242348f681..71242348f681 100644
--- a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/xf86-input-multitouch/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 ac095ffaf89b..ac095ffaf89b 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 69a10673d249..69a10673d249 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 5f7bca097bf6..5f7bca097bf6 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 7da97a0e56e8..7da97a0e56e8 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 fed4c7dc4c95..fed4c7dc4c95 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/zfs/build-fixes-unstable.patch b/nixpkgs/pkgs/os-specific/linux/zfs/build-fixes-unstable.patch
index ff2c6e2e1503..ff2c6e2e1503 100644
--- a/pkgs/os-specific/linux/zfs/build-fixes-unstable.patch
+++ b/nixpkgs/pkgs/os-specific/linux/zfs/build-fixes-unstable.patch
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/nixpkgs/pkgs/os-specific/linux/zfs/default.nix
index ce2f788338e3..ce2f788338e3 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 3738760bb290..3738760bb290 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 4621c2da10fb..4621c2da10fb 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 ee8f00790754..ee8f00790754 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 88af53dd046e..88af53dd046e 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/mingw-w64/default.nix b/nixpkgs/pkgs/os-specific/windows/mingw-w64/default.nix
index a7d4f09b90e9..a7d4f09b90e9 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 6a93cea67080..6a93cea67080 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 c51ff4bd5dfd..c51ff4bd5dfd 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 bbcb028d3cbb..bbcb028d3cbb 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 4fb92569a47a..4fb92569a47a 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 226bbfb16df1..226bbfb16df1 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 ebc95ecaa7a9..ebc95ecaa7a9 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 65690af98697..65690af98697 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 8446578507d8..8446578507d8 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 3d36202e8616..3d36202e8616 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 dca2c0721856..dca2c0721856 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 bec61d460a7a..bec61d460a7a 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 47ef9934a5e8..47ef9934a5e8 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 498c62ee4d88..498c62ee4d88 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 2f7a7c80cb68..2f7a7c80cb68 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 1d0e28ac9f28..1d0e28ac9f28 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 6f738762a109..6f738762a109 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 528dc8a48a0b..528dc8a48a0b 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 7fdbfb6472c9..7fdbfb6472c9 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 8f62670aee93..8f62670aee93 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 247164461183..247164461183 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/brickd/default.nix b/nixpkgs/pkgs/servers/brickd/default.nix
index 4b71aaeca3ad..4b71aaeca3ad 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 61316d0a60a1..61316d0a60a1 100644
--- a/pkgs/servers/caddy/default.nix
+++ b/nixpkgs/pkgs/servers/caddy/default.nix
diff --git a/pkgs/servers/cayley/default.nix b/nixpkgs/pkgs/servers/cayley/default.nix
index befa36edd9e2..befa36edd9e2 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 1e6fadf9f4d8..1e6fadf9f4d8 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 4df24a6d60c0..4df24a6d60c0 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 21a5bad72fc8..21a5bad72fc8 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 0547d48ea87e..0547d48ea87e 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 13fad7059afe..13fad7059afe 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 b1233b764647..b1233b764647 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 8335e40de98f..8335e40de98f 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 35c830dff8a5..35c830dff8a5 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 349502289207..349502289207 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 d364c2a5bcdf..d364c2a5bcdf 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 faa9976bed8a..faa9976bed8a 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 ad15db070f41..ad15db070f41 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 0315a71b1844..0315a71b1844 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 8b2895392bec..8b2895392bec 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 1c093facde5c..1c093facde5c 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 93db472270e2..93db472270e2 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 21aa31d6235e..21aa31d6235e 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 5056df06e598..5056df06e598 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 89e00e0d8cb3..89e00e0d8cb3 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 d2a6dc9df157..d2a6dc9df157 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 e30fcb2b0380..e30fcb2b0380 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 c45098b2ae09..d41057510802 100644
--- a/pkgs/servers/dict/default.nix
+++ b/nixpkgs/pkgs/servers/dict/default.nix
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--enable-dictorg"
     "--datadir=/run/current-system/sw/share/dictd"
+    "--sysconfdir=/etc"
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/dict/dictd-db-collector.nix b/nixpkgs/pkgs/servers/dict/dictd-db-collector.nix
index f635c98602d9..f635c98602d9 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 065218a5b95d..c611f87346c7 100644
--- a/pkgs/servers/dict/dictd-db.nix
+++ b/nixpkgs/pkgs/servers/dict/dictd-db.nix
@@ -56,6 +56,10 @@ in rec {
     url = mirror://sourceforge/freedict/eng-fra.tar.gz;
     sha256 = "0fi6rrnbqnhc6lq8d0nmn30zdqkibrah0mxfg27hsn9z7alwbj3m";
   }) "eng-fra" "en_UK";
+  epo2eng = makeDictdDB (fetchurl {
+    url = https://download.freedict.org/dictionaries/epo-eng/1.0.1/freedict-epo-eng-1.0.1.dictd.tar.xz;
+    sha256 = "1j2nds35f9nw3wr29xay124xsp8455k2l3hqr537dcq69cvwwkkl";
+  }) "epo-eng" "epo-eng" "eo";
   mueller_eng2rus_pkg = makeDictdDB (fetchurl {
     url = mirror://sourceforge/mueller-dict/mueller-dict-3.1.tar.gz;
     sha256 = "04r5xxznvmcb8hkxqbjgfh2gxvbdd87jnhqn5gmgvxxw53zpwfmq";
diff --git a/pkgs/servers/dict/dictd-wiktionary.nix b/nixpkgs/pkgs/servers/dict/dictd-wiktionary.nix
index 13e4757fe89e..13e4757fe89e 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 8a1bb6313ad2..8a1bb6313ad2 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 f5c0cf230af3..f5c0cf230af3 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 8a0210e7254f..8a0210e7254f 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 6a88427c5da1..6a88427c5da1 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 2199d62b4dd7..2199d62b4dd7 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 4c4a45cca793..4c4a45cca793 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 17fdb15ad460..17fdb15ad460 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 d0dcd580c20a..d0dcd580c20a 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 214c3e91f0ef..214c3e91f0ef 100644
--- a/pkgs/servers/dns/coredns/default.nix
+++ b/nixpkgs/pkgs/servers/dns/coredns/default.nix
diff --git a/pkgs/servers/dns/coredns/deps.nix b/nixpkgs/pkgs/servers/dns/coredns/deps.nix
index 4dd8228c8a6a..4dd8228c8a6a 100644
--- a/pkgs/servers/dns/coredns/deps.nix
+++ b/nixpkgs/pkgs/servers/dns/coredns/deps.nix
diff --git a/pkgs/servers/dns/dnsdist/default.nix b/nixpkgs/pkgs/servers/dns/dnsdist/default.nix
index 6757542050af..6757542050af 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 ac44dbbf04d1..ac44dbbf04d1 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 a646fb0b7a46..a646fb0b7a46 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 ce84bb7cb417..ce84bb7cb417 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 cd6e3d5a45dd..cd6e3d5a45dd 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 684dc02dcf3d..684dc02dcf3d 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 4d840462f796..4d840462f796 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 52d95b170f69..52d95b170f69 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 e71abb8bc00f..e71abb8bc00f 100644
--- a/pkgs/servers/echoip/default.nix
+++ b/nixpkgs/pkgs/servers/echoip/default.nix
diff --git a/pkgs/servers/echoip/deps.nix b/nixpkgs/pkgs/servers/echoip/deps.nix
index 4e4f0799bdae..4e4f0799bdae 100644
--- a/pkgs/servers/echoip/deps.nix
+++ b/nixpkgs/pkgs/servers/echoip/deps.nix
diff --git a/pkgs/servers/elasticmq-server-bin/default.nix b/nixpkgs/pkgs/servers/elasticmq-server-bin/default.nix
index d52fdd14301d..d52fdd14301d 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 c1216becaf3d..c1216becaf3d 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 0e424d1d1225..0e424d1d1225 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 d3c5555fa6ad..d3c5555fa6ad 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 5e2381ada1d1..5e2381ada1d1 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 8bab12116b02..8bab12116b02 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 5ce680e36460..5ce680e36460 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 3ac3c98718f7..3ac3c98718f7 100644
--- a/pkgs/servers/felix/remoteshell.nix
+++ b/nixpkgs/pkgs/servers/felix/remoteshell.nix
diff --git a/pkgs/servers/fingerd/bsd-fingerd/default.nix b/nixpkgs/pkgs/servers/fingerd/bsd-fingerd/default.nix
index d5671921abad..d5671921abad 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 80968d587ba9..80968d587ba9 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 caf7d8360f07..caf7d8360f07 100644
--- a/pkgs/servers/firebird/default.nix
+++ b/nixpkgs/pkgs/servers/firebird/default.nix
diff --git a/pkgs/servers/foswiki/default.nix b/nixpkgs/pkgs/servers/foswiki/default.nix
index 67d460809e15..67d460809e15 100644
--- a/pkgs/servers/foswiki/default.nix
+++ b/nixpkgs/pkgs/servers/foswiki/default.nix
diff --git a/pkgs/servers/foundationdb/cmake.nix b/nixpkgs/pkgs/servers/foundationdb/cmake.nix
index 87e4a22b0514..87e4a22b0514 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 b29c5298b77d..b29c5298b77d 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 ebbacdf871ea..ebbacdf871ea 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 0e0df7ade82b..0e0df7ade82b 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/ldflags-5.1.patch b/nixpkgs/pkgs/servers/foundationdb/patches/ldflags-5.1.patch
index 4d523a7ecdd3..4d523a7ecdd3 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 ee5911e495f8..ee5911e495f8 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 1fa17a9615aa..1fa17a9615aa 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 9d1ae992efc9..9d1ae992efc9 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 55b834c54369..55b834c54369 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 3e9ce1428ada..3e9ce1428ada 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 0eb71492be3e..0eb71492be3e 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 ed36b33bdebc..ed36b33bdebc 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 ca071d215af9..ca071d215af9 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 5f6e7d466cfd..5f6e7d466cfd 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 0a6144395116..0a6144395116 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 1ef624f2a41e..1ef624f2a41e 100644
--- a/pkgs/servers/ftp/vsftpd/default.nix
+++ b/nixpkgs/pkgs/servers/ftp/vsftpd/default.nix
diff --git a/pkgs/servers/gnatsd/default.nix b/nixpkgs/pkgs/servers/gnatsd/default.nix
index e8e08271b3bc..e8e08271b3bc 100644
--- a/pkgs/servers/gnatsd/default.nix
+++ b/nixpkgs/pkgs/servers/gnatsd/default.nix
diff --git a/pkgs/servers/gopher/gofish/default.nix b/nixpkgs/pkgs/servers/gopher/gofish/default.nix
index 754cba588258..754cba588258 100644
--- a/pkgs/servers/gopher/gofish/default.nix
+++ b/nixpkgs/pkgs/servers/gopher/gofish/default.nix
diff --git a/pkgs/servers/gotty/default.nix b/nixpkgs/pkgs/servers/gotty/default.nix
index ebade244bdf7..ebade244bdf7 100644
--- a/pkgs/servers/gotty/default.nix
+++ b/nixpkgs/pkgs/servers/gotty/default.nix
diff --git a/pkgs/servers/gotty/deps.nix b/nixpkgs/pkgs/servers/gotty/deps.nix
index 4f59dc414c49..4f59dc414c49 100644
--- a/pkgs/servers/gotty/deps.nix
+++ b/nixpkgs/pkgs/servers/gotty/deps.nix
diff --git a/pkgs/servers/gpm/default.nix b/nixpkgs/pkgs/servers/gpm/default.nix
index 3cd36858204e..3cd36858204e 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 a8721a3e7029..a8721a3e7029 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 58ae754ecfb5..58ae754ecfb5 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 3e387167d6fb..3e387167d6fb 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 fbb06db6aa39..fbb06db6aa39 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 f205b600dd95..f205b600dd95 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 c4be1f3c3b34..c4be1f3c3b34 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 6a33ac638d21..6a33ac638d21 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 aab651d5a4a5..aab651d5a4a5 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 58033edb07d7..58033edb07d7 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 95ec267dba24..95ec267dba24 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 bad01c01a6bd..bad01c01a6bd 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 82df1f6b988f..82df1f6b988f 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 7fc80ed75407..7fc80ed75407 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 8a2c8d0e7195..8a2c8d0e7195 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 d778e8df18f4..d778e8df18f4 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 895b089f991d..895b089f991d 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 c65d3b6de82a..c65d3b6de82a 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 a2cf2d0386a2..a2cf2d0386a2 100755
--- a/pkgs/servers/home-assistant/parse-requirements.py
+++ b/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py
diff --git a/pkgs/servers/http/4store/4store-1.1.6-glibc-2.26.patch b/nixpkgs/pkgs/servers/http/4store/4store-1.1.6-glibc-2.26.patch
index dda21c54f693..dda21c54f693 100644
--- a/pkgs/servers/http/4store/4store-1.1.6-glibc-2.26.patch
+++ b/nixpkgs/pkgs/servers/http/4store/4store-1.1.6-glibc-2.26.patch
diff --git a/pkgs/servers/http/4store/default.nix b/nixpkgs/pkgs/servers/http/4store/default.nix
index 664953ca34dc..664953ca34dc 100644
--- a/pkgs/servers/http/4store/default.nix
+++ b/nixpkgs/pkgs/servers/http/4store/default.nix
diff --git a/pkgs/servers/http/4store/src-for-default.nix b/nixpkgs/pkgs/servers/http/4store/src-for-default.nix
index 7076b921911e..7076b921911e 100644
--- a/pkgs/servers/http/4store/src-for-default.nix
+++ b/nixpkgs/pkgs/servers/http/4store/src-for-default.nix
diff --git a/pkgs/servers/http/4store/src-info-for-default.nix b/nixpkgs/pkgs/servers/http/4store/src-info-for-default.nix
index 91a9bad92def..91a9bad92def 100644
--- a/pkgs/servers/http/4store/src-info-for-default.nix
+++ b/nixpkgs/pkgs/servers/http/4store/src-info-for-default.nix
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix
index 3c3d4c20df1b..3c3d4c20df1b 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 8a773631ee6c..8a773631ee6c 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 63b69fb142f6..63b69fb142f6 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_dnssd/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_dnssd/default.nix
index d681146eee5d..d681146eee5d 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 2b8693f7379d..2b8693f7379d 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 ff767d9ad437..ff767d9ad437 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_perl/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_perl/default.nix
index 04746d678c52..04746d678c52 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_python/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_python/default.nix
index f947bf535cc9..f947bf535cc9 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 29667e11ed8e..29667e11ed8e 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_wsgi/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
index ff71e460b2ac..ff71e460b2ac 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 138864aec7d0..138864aec7d0 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 aa826a9c528b..aa826a9c528b 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 650b9053191d..650b9053191d 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 2299f732a76e..2299f732a76e 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 bb7d4ca610c7..bb7d4ca610c7 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 3efc97f6296b..3efc97f6296b 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 19b2d01f5be8..19b2d01f5be8 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 ceffd3e0260d..ceffd3e0260d 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 742db5567075..742db5567075 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 3a1eb50f05be..3a1eb50f05be 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 c5702132d280..c5702132d280 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 6af39a0cb633..6af39a0cb633 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 fd2dec44c7f3..fd2dec44c7f3 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 80a3d6b105cb..80a3d6b105cb 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 7dacb997d470..7dacb997d470 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 878211ebf024..878211ebf024 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 b636f79e6c60..b636f79e6c60 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 37a0a98d4e01..37a0a98d4e01 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 b18e1ea162f0..b18e1ea162f0 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 31b24915c4da..31b24915c4da 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 12b873df6a40..12b873df6a40 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 abbf171daa96..abbf171daa96 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 7bb025499592..7bb025499592 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 5e21e8734bf1..5e21e8734bf1 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 9dec715bf6c5..9dec715bf6c5 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 ffc6f81fdc24..ffc6f81fdc24 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 c20139017436..c20139017436 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 479c9e41aa91..479c9e41aa91 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 13b62a8829da..13b62a8829da 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 890e68765b40..890e68765b40 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 6bb4ce46a43b..6bb4ce46a43b 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 c38ca046a35b..c38ca046a35b 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 7d592d0256b7..7d592d0256b7 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 cfd295096bc1..cfd295096bc1 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 ccf0415d440b..ccf0415d440b 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 79b92bdd7c57..79b92bdd7c57 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 334f09e8a0d0..334f09e8a0d0 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 b5d5d5f7992d..b5d5d5f7992d 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 c46482b30149..c46482b30149 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 cac31ed9d595..cac31ed9d595 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 6e012c98737e..6e012c98737e 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 2e36367e9dcf..2e36367e9dcf 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 7f14f6fff195..7f14f6fff195 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 fded6bdfafba..fded6bdfafba 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 14829c5e85d8..14829c5e85d8 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 d070a9f17404..d070a9f17404 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 39b9b31f7f0a..39b9b31f7f0a 100644
--- a/pkgs/servers/http/unit/default.nix
+++ b/nixpkgs/pkgs/servers/http/unit/default.nix
diff --git a/pkgs/servers/http/webfs/default.nix b/nixpkgs/pkgs/servers/http/webfs/default.nix
index 3fb3890f9c4e..3fb3890f9c4e 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 78b83b725887..78b83b725887 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 5d6b47d28b5d..5d6b47d28b5d 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 827f6122b573..827f6122b573 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 912e520180e6..912e520180e6 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 08f165af76b2..08f165af76b2 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 7c8014449216..7c8014449216 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 bbd5b80184f7..bbd5b80184f7 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 2850738edccc..2850738edccc 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 ddc7c3f85eda..ddc7c3f85eda 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 6ec5937147e2..6ec5937147e2 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 55ec611d6053..55ec611d6053 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 11bfb99782d3..11bfb99782d3 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 7c592fca33b6..7c592fca33b6 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 273bcf6945d9..273bcf6945d9 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 3d28481cd84e..3d28481cd84e 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 941138bb0a52..941138bb0a52 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 a21f6cc89a25..a21f6cc89a25 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 a43f7d7c09ad..a43f7d7c09ad 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 fdad63d67af4..fdad63d67af4 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 81eeae804d25..81eeae804d25 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 f57c94cd1084..f57c94cd1084 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 be5c05295731..be5c05295731 100644
--- a/pkgs/servers/interlock/deps.nix
+++ b/nixpkgs/pkgs/servers/interlock/deps.nix
diff --git a/pkgs/servers/irc/charybdis/default.nix b/nixpkgs/pkgs/servers/irc/charybdis/default.nix
index dc053f4581cc..dc053f4581cc 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 cf5b572c9eb4..cf5b572c9eb4 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 5194ab278bf7..5194ab278bf7 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 002760ff0fd3..002760ff0fd3 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 166555099588..166555099588 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 1091e31cf9f6..1091e31cf9f6 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 9345fbe03d65..9345fbe03d65 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 bbf39e5be466..bbf39e5be466 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 3ebcaf7286b4..3ebcaf7286b4 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 7c7755dee482..7c7755dee482 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 e7bff373c3a8..e7bff373c3a8 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 fc88d645f27a..fc88d645f27a 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 ad1038bbc47f..ad1038bbc47f 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 2e17001abc50..2e17001abc50 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 297d0724a496..297d0724a496 100644
--- a/pkgs/servers/livepeer/deps.nix
+++ b/nixpkgs/pkgs/servers/livepeer/deps.nix
diff --git a/pkgs/servers/mail/archiveopteryx/default.nix b/nixpkgs/pkgs/servers/mail/archiveopteryx/default.nix
index 080cbc897756..080cbc897756 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 7214c08d2427..7214c08d2427 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 102ae0a471dd..102ae0a471dd 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 d4bfd3c6ca57..d4bfd3c6ca57 100644
--- a/pkgs/servers/mail/dkimproxy/default.nix
+++ b/nixpkgs/pkgs/servers/mail/dkimproxy/default.nix
diff --git a/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch b/nixpkgs/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch
index 1914933c558c..1914933c558c 100644
--- a/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch
+++ b/nixpkgs/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch
diff --git a/pkgs/servers/mail/dovecot/default.nix b/nixpkgs/pkgs/servers/mail/dovecot/default.nix
index c639a9a26cb3..c639a9a26cb3 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 6a812863f052..6a812863f052 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 44e2223960a2..44e2223960a2 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 60ff9cab2d3d..60ff9cab2d3d 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 b4f671862f88..b4f671862f88 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 019c84d2898b..019c84d2898b 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 9967c3a549a5..9967c3a549a5 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 91445afa97df..91445afa97df 100644
--- a/pkgs/servers/mail/mailman/default.nix
+++ b/nixpkgs/pkgs/servers/mail/mailman/default.nix
diff --git a/pkgs/servers/mail/mailman/fix-var-prefix.patch b/nixpkgs/pkgs/servers/mail/mailman/fix-var-prefix.patch
index 9bb735ecbed7..9bb735ecbed7 100644
--- a/pkgs/servers/mail/mailman/fix-var-prefix.patch
+++ b/nixpkgs/pkgs/servers/mail/mailman/fix-var-prefix.patch
diff --git a/pkgs/servers/mail/mlmmj/default.nix b/nixpkgs/pkgs/servers/mail/mlmmj/default.nix
index 98b270ad7d41..98b270ad7d41 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 4b753bdf0cdb..4b753bdf0cdb 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 cd48ab12e24e..cd48ab12e24e 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 1d4ad63c37d2..1d4ad63c37d2 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 5e1cfd004299..5e1cfd004299 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 c97d8e4ccf38..c97d8e4ccf38 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 e14b62a85971..e14b62a85971 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 763ede102f25..763ede102f25 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 4f440ae59663..4f440ae59663 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 35843a38bb31..35843a38bb31 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 54301dd873b9..54301dd873b9 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 5de22573ea33..5de22573ea33 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 634bba2e57c9..634bba2e57c9 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 8c00bcdbee25..8c00bcdbee25 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 8f85bc5f6d6d..8f85bc5f6d6d 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 350fbf929b74..350fbf929b74 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 d93eaf0aaa0d..d93eaf0aaa0d 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 4f5d2f611110..4f5d2f611110 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 f7a2078c0343..f7a2078c0343 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 0abfc00fdd66..0abfc00fdd66 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 f13c57e3b35d..f13c57e3b35d 100644
--- a/pkgs/servers/mail/postsrsd/default.nix
+++ b/nixpkgs/pkgs/servers/mail/postsrsd/default.nix
diff --git a/pkgs/servers/mail/pypolicyd-spf/default.nix b/nixpkgs/pkgs/servers/mail/pypolicyd-spf/default.nix
index d5e410a86c1f..d5e410a86c1f 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 739270326e5b..739270326e5b 100644
--- a/pkgs/servers/mail/rmilter/default.nix
+++ b/nixpkgs/pkgs/servers/mail/rmilter/default.nix
diff --git a/pkgs/servers/mail/rmilter/fd-passing-libmilter.patch b/nixpkgs/pkgs/servers/mail/rmilter/fd-passing-libmilter.patch
index 3ab61a6fab00..3ab61a6fab00 100644
--- a/pkgs/servers/mail/rmilter/fd-passing-libmilter.patch
+++ b/nixpkgs/pkgs/servers/mail/rmilter/fd-passing-libmilter.patch
diff --git a/pkgs/servers/mail/rspamd/default.nix b/nixpkgs/pkgs/servers/mail/rspamd/default.nix
index 25e7807659df..25e7807659df 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 186f4670153f..186f4670153f 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 3264aefc0722..3264aefc0722 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 7bd7df849244..7bd7df849244 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 0efbefd6cd24..0efbefd6cd24 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 95e28196a229..95e28196a229 100644
--- a/pkgs/servers/matrix-synapse/homeserver-script.patch
+++ b/nixpkgs/pkgs/servers/matrix-synapse/homeserver-script.patch
diff --git a/pkgs/servers/matterbridge/default.nix b/nixpkgs/pkgs/servers/matterbridge/default.nix
index 9e5a9ffe780d..9e5a9ffe780d 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 2fc8232f0a28..2fc8232f0a28 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 6707055eaa6b..6707055eaa6b 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 7499f203136c..7499f203136c 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 f6526ab1f715..f6526ab1f715 100644
--- a/pkgs/servers/mautrix-whatsapp/default.nix
+++ b/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix
diff --git a/pkgs/servers/mautrix-whatsapp/deps.nix b/nixpkgs/pkgs/servers/mautrix-whatsapp/deps.nix
index 8624889e3468..8624889e3468 100644
--- a/pkgs/servers/mautrix-whatsapp/deps.nix
+++ b/nixpkgs/pkgs/servers/mautrix-whatsapp/deps.nix
diff --git a/pkgs/servers/mediatomb/default.nix b/nixpkgs/pkgs/servers/mediatomb/default.nix
index 75d12a5f66fe..75d12a5f66fe 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 d983c0677191..d983c0677191 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 bff9d5624e83..bff9d5624e83 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 f30b5af6cad5..f30b5af6cad5 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 fe1f1c6760d8..fe1f1c6760d8 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 00f0f245f6b3..00f0f245f6b3 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 dde0a547693c..dde0a547693c 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 b677b6080d1f..b677b6080d1f 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 3282c91abac8..3282c91abac8 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 1ebd852380c4..1ebd852380c4 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 a20793a849cf..a20793a849cf 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 10c8811c548f..10c8811c548f 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 373654126614..373654126614 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 8dd294bcdf84..8dd294bcdf84 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 ec1f82507ce1..ec1f82507ce1 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 5bc0ea45e2b6..5bc0ea45e2b6 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/subsonic/default.nix b/nixpkgs/pkgs/servers/misc/subsonic/default.nix
index 50e754791e6d..50e754791e6d 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 f15b7ca2e821..f15b7ca2e821 100644
--- a/pkgs/servers/misc/taskserver/default.nix
+++ b/nixpkgs/pkgs/servers/misc/taskserver/default.nix
diff --git a/pkgs/servers/monitoring/bosun/default.nix b/nixpkgs/pkgs/servers/monitoring/bosun/default.nix
index c8eb07319245..c8eb07319245 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 502a3026b2ae..502a3026b2ae 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 a888549bb6aa..a888549bb6aa 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 6494dc61a87c..6494dc61a87c 100644
--- a/pkgs/servers/monitoring/consul-alerts/deps.nix
+++ b/nixpkgs/pkgs/servers/monitoring/consul-alerts/deps.nix
diff --git a/pkgs/servers/monitoring/facette/default.nix b/nixpkgs/pkgs/servers/monitoring/facette/default.nix
index efa62e261b74..efa62e261b74 100644
--- a/pkgs/servers/monitoring/facette/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/facette/default.nix
diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/nixpkgs/pkgs/servers/monitoring/fusion-inventory/default.nix
index 27e3cfdab9d1..27e3cfdab9d1 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 b360f418aa0b..b360f418aa0b 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 1004947d5b12..1004947d5b12 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 70ba29dfe033..70ba29dfe033 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 39c048576388..39c048576388 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 969a58aff85d..969a58aff85d 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 af5f2880a0f8..af5f2880a0f8 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 33c4b8e83b2d..33c4b8e83b2d 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 63bded64a36e..63bded64a36e 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 45e380379d2f..45e380379d2f 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 3e009254bcad..3e009254bcad 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 5044aef2bb53..5044aef2bb53 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 6de3c8b6e139..6de3c8b6e139 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 9421d194a9e5..9421d194a9e5 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 6e14d6137034..6e14d6137034 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 856f3d73011e..856f3d73011e 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 34beada87e82..34beada87e82 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 78eac7283051..78eac7283051 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 ef66f48ecb42..ef66f48ecb42 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 3459a5fe8f7f..3459a5fe8f7f 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 cec4c4942b53..cec4c4942b53 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 cdfd8ab9beeb..cdfd8ab9beeb 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/net-snmp/0002-autoconf-version.patch b/nixpkgs/pkgs/servers/monitoring/net-snmp/0002-autoconf-version.patch
index 0ebb1751d6bf..0ebb1751d6bf 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 2bbab30d9ecd..2bbab30d9ecd 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 401f9ffc4066..401f9ffc4066 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 cb12fe819a95..cb12fe819a95 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 888cef61fcb6..888cef61fcb6 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 c47e627f8169..c47e627f8169 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/uptime.nix b/nixpkgs/pkgs/servers/monitoring/plugins/uptime.nix
index 9f03c9ea96f6..9f03c9ea96f6 100644
--- a/pkgs/servers/monitoring/plugins/uptime.nix
+++ b/nixpkgs/pkgs/servers/monitoring/plugins/uptime.nix
diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix
index e104f31a74de..e104f31a74de 100644
--- a/pkgs/servers/monitoring/prometheus/alertmanager.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix
diff --git a/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/bind-exporter.nix
index db58c7e14e5f..db58c7e14e5f 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 1f342adebaa0..1f342adebaa0 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 0d6fbac60e5d..0d6fbac60e5d 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 47abcb33ee79..47abcb33ee79 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/default.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix
index 3523c3b08170..3523c3b08170 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-deps.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/dnsmasq-exporter-deps.nix
index dd3c1b4d4c2d..dd3c1b4d4c2d 100644
--- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter-deps.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/dnsmasq-exporter-deps.nix
diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
index e43488bbaaeb..e43488bbaaeb 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 d94aad821485..d94aad821485 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 5a3fd23ec22e..5a3fd23ec22e 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 2d94ffeba26a..2d94ffeba26a 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 071035b2a4ac..071035b2a4ac 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/haproxy-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
index b2a0e3875891..b2a0e3875891 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 ca1dc83e96ad..ca1dc83e96ad 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 aeb7b7445a5d..aeb7b7445a5d 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 9416125bc0c2..9416125bc0c2 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/mesos-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
index ade9bb87d993..ade9bb87d993 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 e8fdcc95da2f..e8fdcc95da2f 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 8b6c54d41f91..8b6c54d41f91 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 1993975e2bfa..1993975e2bfa 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 9180a5113492..9180a5113492 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/nginx-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
index 5c5042b6c7cd..5c5042b6c7cd 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/nginx-exporter_deps.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.nix
index 2fa60de5b493..2fa60de5b493 100644
--- a/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.nix
diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/node-exporter.nix
index 80ad4a32be75..80ad4a32be75 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 93aae1b867e9..93aae1b867e9 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 eac962f75606..eac962f75606 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 07bedaba9f36..07bedaba9f36 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 97df26aea4e5..97df26aea4e5 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/prom2json.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/prom2json.nix
index 5e4ebb581400..5e4ebb581400 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 20cabe3d3857..20cabe3d3857 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 3c3835913865..3c3835913865 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 34120ad3fdae..34120ad3fdae 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 7a15a6a7b68c..7a15a6a7b68c 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 be8fbd3d85cb..be8fbd3d85cb 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 792e0b33aee1..792e0b33aee1 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 0c5cc6267659..0c5cc6267659 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 ef971ce04746..ef971ce04746 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 18fa3f98db23..18fa3f98db23 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/varnish-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
index b23270cd8c1e..b23270cd8c1e 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/varnish-exporter_deps.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/varnish-exporter_deps.nix
index 19ff1e9aa560..19ff1e9aa560 100644
--- a/pkgs/servers/monitoring/prometheus/varnish-exporter_deps.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/varnish-exporter_deps.nix
diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
index 77bc187e3575..77bc187e3575 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 9abae119ca87..9abae119ca87 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 ed780f6ce4b6..ed780f6ce4b6 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 6e0e97c7cc63..6e0e97c7cc63 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 f2446be79f61..f2446be79f61 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 50325144fcac..50325144fcac 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 559948468509..559948468509 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 3f570024febb..3f570024febb 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 2d0b31e999fc..2d0b31e999fc 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 f1a6a08267d6..f1a6a08267d6 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 32134255711c..32134255711c 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 ab8365c23f81..ab8365c23f81 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 ee3b9d818ce1..ee3b9d818ce1 100644
--- a/pkgs/servers/monitoring/telegraf/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix
diff --git a/pkgs/servers/monitoring/telegraf/deps-1.10.2.nix b/nixpkgs/pkgs/servers/monitoring/telegraf/deps-1.10.2.nix
index 2655595ee693..2655595ee693 100644
--- a/pkgs/servers/monitoring/telegraf/deps-1.10.2.nix
+++ b/nixpkgs/pkgs/servers/monitoring/telegraf/deps-1.10.2.nix
diff --git a/pkgs/servers/monitoring/uchiwa/bower-packages.nix b/nixpkgs/pkgs/servers/monitoring/uchiwa/bower-packages.nix
index 40789fa34f8d..40789fa34f8d 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 1de1edfa8e11..1de1edfa8e11 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 cf5376318b45..cf5376318b45 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 10da7f8adbf9..10da7f8adbf9 100755
--- a/pkgs/servers/monitoring/uchiwa/update.sh
+++ b/nixpkgs/pkgs/servers/monitoring/uchiwa/update.sh
diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/nixpkgs/pkgs/servers/monitoring/zabbix/2.0.nix
index ce660fa6e88b..ce660fa6e88b 100644
--- a/pkgs/servers/monitoring/zabbix/2.0.nix
+++ b/nixpkgs/pkgs/servers/monitoring/zabbix/2.0.nix
diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/nixpkgs/pkgs/servers/monitoring/zabbix/2.2.nix
index ac0e6bb81f8b..ac0e6bb81f8b 100644
--- a/pkgs/servers/monitoring/zabbix/2.2.nix
+++ b/nixpkgs/pkgs/servers/monitoring/zabbix/2.2.nix
diff --git a/pkgs/servers/monitoring/zabbix/3.4.nix b/nixpkgs/pkgs/servers/monitoring/zabbix/3.4.nix
index 72e6fa55b003..72e6fa55b003 100644
--- a/pkgs/servers/monitoring/zabbix/3.4.nix
+++ b/nixpkgs/pkgs/servers/monitoring/zabbix/3.4.nix
diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/nixpkgs/pkgs/servers/monitoring/zabbix/default.nix
index 4b6bd5e0b250..4b6bd5e0b250 100644
--- a/pkgs/servers/monitoring/zabbix/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/zabbix/default.nix
diff --git a/pkgs/servers/monitoring/zipkin/default.nix b/nixpkgs/pkgs/servers/monitoring/zipkin/default.nix
index 4c3479d8662e..4c3479d8662e 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 d8aed78e28ae..d8aed78e28ae 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 740fd4739ab7..740fd4739ab7 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 3e4c036418d2..3e4c036418d2 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 04daa2f4a855..04daa2f4a855 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 69c7f137e3dc..69c7f137e3dc 100644
--- a/pkgs/servers/mtprotoproxy/default.nix
+++ b/nixpkgs/pkgs/servers/mtprotoproxy/default.nix
diff --git a/pkgs/servers/mxisd/0001-gradle.patch b/nixpkgs/pkgs/servers/mxisd/0001-gradle.patch
index 8a9f5a81180b..8a9f5a81180b 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 5d3a220d9b19..5d3a220d9b19 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 0b6451d104f3..0b6451d104f3 100644
--- a/pkgs/servers/nas/default.nix
+++ b/nixpkgs/pkgs/servers/nas/default.nix
diff --git a/pkgs/servers/nats-streaming-server/default.nix b/nixpkgs/pkgs/servers/nats-streaming-server/default.nix
index cc73b2e1f6f2..cc73b2e1f6f2 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 de317ada6e45..de317ada6e45 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 955547289bc6..955547289bc6 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 c6ab0e5d9fee..c6ab0e5d9fee 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 0fcb5047549d..0fcb5047549d 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 d7c36b0cb416..d7c36b0cb416 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 c5290709b625..c5290709b625 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 f3d5d121c387..f3d5d121c387 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 be7c51a7ef54..be7c51a7ef54 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 a18675347d58..a18675347d58 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 12684eab551a..12684eab551a 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 d73e242a9422..d73e242a9422 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 88c361e6a91f..88c361e6a91f 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 a1aad75ce3f6..a1aad75ce3f6 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 5ca268166e03..5ca268166e03 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 05f572c8caaa..05f572c8caaa 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 da73bcf1e3b6..da73bcf1e3b6 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 f3035e131409..f3035e131409 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 937bd8181441..937bd8181441 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 3669df47ee2a..3669df47ee2a 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 5492ad9d8eaa..5492ad9d8eaa 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 b1d9154a7475..b1d9154a7475 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 ca2c043deb2d..ca2c043deb2d 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 25dfa5f47bd3..25dfa5f47bd3 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 0ce948c715e0..0ce948c715e0 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 d6ee407e3418..d6ee407e3418 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 36b29b57bf97..36b29b57bf97 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 1524ca207009..1524ca207009 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 170b0d5f22f9..170b0d5f22f9 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/nsq/default.nix b/nixpkgs/pkgs/servers/nsq/default.nix
index d48587c924e7..d48587c924e7 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 751a18ca92d7..751a18ca92d7 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 d094fda84b4f..d094fda84b4f 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 dd10ab286689..dd10ab286689 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 22f09994ebf0..22f09994ebf0 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 6f771e2bf33a..6f771e2bf33a 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 17048b68024e..17048b68024e 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 412765fe8a5b..412765fe8a5b 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 094d9871f64f..094d9871f64f 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 2b4fd58b23a4..2b4fd58b23a4 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 c77bef6ad24e..c77bef6ad24e 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 958fcd578c2b..958fcd578c2b 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 d1b23d8bcae5..d1b23d8bcae5 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 f68c777b6f09..f68c777b6f09 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 05ee7f343523..05ee7f343523 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 9a5d7b531de4..9a5d7b531de4 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 8eca1fb7790b..8eca1fb7790b 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 1f58c309aa5e..1f58c309aa5e 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 a113d583cb1a..a113d583cb1a 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 2f2b1195cf32..2f2b1195cf32 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 64ce1c4a0bbf..64ce1c4a0bbf 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 a7a0791b8520..a7a0791b8520 100644
--- a/pkgs/servers/polipo/default.nix
+++ b/nixpkgs/pkgs/servers/polipo/default.nix
diff --git a/pkgs/servers/prayer/default.nix b/nixpkgs/pkgs/servers/prayer/default.nix
index 7997d0ebcd8b..7997d0ebcd8b 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 439202dd9555..439202dd9555 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 6aaaf95fae16..6aaaf95fae16 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 13b5d4c3c9f0..13b5d4c3c9f0 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 1d8f0c36caec..1d8f0c36caec 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 a293643a6f6d..a293643a6f6d 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 13db868845a0..13db868845a0 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 90e27b2907e5..90e27b2907e5 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 76f3ded78086..76f3ded78086 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 04d520b412c1..04d520b412c1 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 3dcb6605a61e..3dcb6605a61e 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 87f4326c48c3..87f4326c48c3 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 684e070292c7..684e070292c7 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 64b212eb49fb..64b212eb49fb 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 96710d6162d7..96710d6162d7 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 a490acb1f739..a490acb1f739 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 42333b69eb15..42333b69eb15 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 b66386222f76..b66386222f76 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 4eed1227be68..4eed1227be68 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 a756a3140cb2..a756a3140cb2 100644
--- a/pkgs/servers/roundcube/plugins/roundcube-plugin.nix
+++ b/nixpkgs/pkgs/servers/roundcube/plugins/roundcube-plugin.nix
diff --git a/pkgs/servers/rpcbind/default.nix b/nixpkgs/pkgs/servers/rpcbind/default.nix
index fc28f621959b..fc28f621959b 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 450d33aa1c40..450d33aa1c40 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 b2e40a8ede0e..b2e40a8ede0e 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 5727a9b50c58..5727a9b50c58 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 364fcb118ce4..364fcb118ce4 100644
--- a/pkgs/servers/sabnzbd/default.nix
+++ b/nixpkgs/pkgs/servers/sabnzbd/default.nix
diff --git a/pkgs/servers/samba/3.x.nix b/nixpkgs/pkgs/servers/samba/3.x.nix
index 1f432c189880..1f432c189880 100644
--- a/pkgs/servers/samba/3.x.nix
+++ b/nixpkgs/pkgs/servers/samba/3.x.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 7c973e5bd26a..7c973e5bd26a 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 6576a43322e5..6576a43322e5 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 820470f939e7..820470f939e7 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 4a6ef57bba77..4a6ef57bba77 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/nixpkgs/pkgs/servers/samba/4.x.nix
diff --git a/pkgs/servers/samba/master.nix b/nixpkgs/pkgs/servers/samba/master.nix
index 21038a0f2183..21038a0f2183 100644
--- a/pkgs/servers/samba/master.nix
+++ b/nixpkgs/pkgs/servers/samba/master.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 9f6577c65c14..9f6577c65c14 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/search/elasticsearch/5.x.nix b/nixpkgs/pkgs/servers/search/elasticsearch/5.x.nix
index 6142d751dab1..6142d751dab1 100644
--- a/pkgs/servers/search/elasticsearch/5.x.nix
+++ b/nixpkgs/pkgs/servers/search/elasticsearch/5.x.nix
diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/nixpkgs/pkgs/servers/search/elasticsearch/6.x.nix
index fffc84b2d281..fffc84b2d281 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 ddb1d2299cbb..ddb1d2299cbb 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-classpath-5.x.patch b/nixpkgs/pkgs/servers/search/elasticsearch/es-classpath-5.x.patch
index ccdca1e53afc..ccdca1e53afc 100644
--- a/pkgs/servers/search/elasticsearch/es-classpath-5.x.patch
+++ b/nixpkgs/pkgs/servers/search/elasticsearch/es-classpath-5.x.patch
diff --git a/pkgs/servers/search/elasticsearch/es-home-5.x.patch b/nixpkgs/pkgs/servers/search/elasticsearch/es-home-5.x.patch
index cee0137312f1..cee0137312f1 100644
--- a/pkgs/servers/search/elasticsearch/es-home-5.x.patch
+++ b/nixpkgs/pkgs/servers/search/elasticsearch/es-home-5.x.patch
diff --git a/pkgs/servers/search/elasticsearch/es-home-6.x.patch b/nixpkgs/pkgs/servers/search/elasticsearch/es-home-6.x.patch
index aba8d396a69c..aba8d396a69c 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 3a480bd74674..3a480bd74674 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 f69b3637f955..f69b3637f955 100644
--- a/pkgs/servers/search/groonga/default.nix
+++ b/nixpkgs/pkgs/servers/search/groonga/default.nix
diff --git a/pkgs/servers/search/solr/8.x.nix b/nixpkgs/pkgs/servers/search/solr/8.x.nix
index 3c21a2a77efb..3c21a2a77efb 100644
--- a/pkgs/servers/search/solr/8.x.nix
+++ b/nixpkgs/pkgs/servers/search/solr/8.x.nix
diff --git a/pkgs/servers/search/solr/default.nix b/nixpkgs/pkgs/servers/search/solr/default.nix
index 6a32ce39d5ca..6a32ce39d5ca 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 7ba23f61fedb..7ba23f61fedb 100644
--- a/pkgs/servers/search/sphinxsearch/default.nix
+++ b/nixpkgs/pkgs/servers/search/sphinxsearch/default.nix
diff --git a/pkgs/servers/serf/default.nix b/nixpkgs/pkgs/servers/serf/default.nix
index 4c5f71cb37d6..4c5f71cb37d6 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 5c4a35431436..5c4a35431436 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 e5312b92902e..e5312b92902e 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 cb5d79bdfcce..cb5d79bdfcce 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 70bf5c32b3d4..70bf5c32b3d4 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 d84bdd2eb161..d84bdd2eb161 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 060b58d18b1b..060b58d18b1b 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 9399e20205b9..9399e20205b9 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 ccc37389401b..ccc37389401b 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 6dc044092ad5..6dc044092ad5 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 7a0994ef814b..7a0994ef814b 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 6ee119520b41..6ee119520b41 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 fdb1dcbd1cf6..fdb1dcbd1cf6 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 083a224d1558..083a224d1558 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 e6a26bf2506c..e6a26bf2506c 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 c37eaad2f7fb..c37eaad2f7fb 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 aed30e467e8b..aed30e467e8b 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 1252153b79ac..1252153b79ac 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 b4403e8c7bc7..b4403e8c7bc7 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 deeeabda7451..deeeabda7451 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 82d79785b11c..82d79785b11c 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 a4f4eb120458..a4f4eb120458 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 d755f864d4e3..d755f864d4e3 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 3409fc00066f..3409fc00066f 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 7eaa5b3e8a05..7eaa5b3e8a05 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 e26e8f057b6d..e26e8f057b6d 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 12cd3bfaad93..12cd3bfaad93 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 22ec301bceda..22ec301bceda 100644
--- a/pkgs/servers/sql/cockroachdb/default.nix
+++ b/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix
diff --git a/pkgs/servers/sql/mariadb/cmake-includedir.patch b/nixpkgs/pkgs/servers/sql/mariadb/cmake-includedir.patch
index 0c4fe7d321e2..0c4fe7d321e2 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 d2a4535f7ba9..d2a4535f7ba9 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/default.nix b/nixpkgs/pkgs/servers/sql/mariadb/default.nix
index 94cdf801ff29..94cdf801ff29 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/nixpkgs/pkgs/servers/sql/mariadb/default.nix
diff --git a/pkgs/servers/sql/mariadb/fix-c++11-narrowing-error.patch b/nixpkgs/pkgs/servers/sql/mariadb/fix-c++11-narrowing-error.patch
index 7399d8e39275..7399d8e39275 100644
--- a/pkgs/servers/sql/mariadb/fix-c++11-narrowing-error.patch
+++ b/nixpkgs/pkgs/servers/sql/mariadb/fix-c++11-narrowing-error.patch
diff --git a/pkgs/servers/sql/monetdb/default.nix b/nixpkgs/pkgs/servers/sql/monetdb/default.nix
index 287054a750b4..287054a750b4 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 a5ba86cb0808..a5ba86cb0808 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 f6edfe388aca..f6edfe388aca 100644
--- a/pkgs/servers/sql/mssql/jdbc/default.nix
+++ b/nixpkgs/pkgs/servers/sql/mssql/jdbc/default.nix
diff --git a/nixpkgs/pkgs/servers/sql/mysql/5.6.x.nix b/nixpkgs/pkgs/servers/sql/mysql/5.6.x.nix
new file mode 100644
index 000000000000..7e61bb6e6c5a
--- /dev/null
+++ b/nixpkgs/pkgs/servers/sql/mysql/5.6.x.nix
@@ -0,0 +1,87 @@
+{ stdenv, fetchurl, cmake, bison
+, boost, libedit, libevent, lz4, ncurses, openssl, protobuf, readline, zlib, perl
+, cctools, CoreServices, developer_cmds }:
+
+# Note: zlib is not required; MySQL can use an internal zlib.
+
+let
+self = stdenv.mkDerivation rec {
+  name = "mysql-${version}";
+  version = "5.6.44";
+
+  src = fetchurl {
+    url = "mirror://mysql/MySQL-5.6/${name}.tar.gz";
+    sha256 = "0dnkrqrg1dpnzphb97fb6q061n0cdfidhagrkfq5cs127wncjcf0";
+  };
+
+  preConfigure = stdenv.lib.optional stdenv.isDarwin ''
+    ln -s /bin/ps $TMPDIR/ps
+    export PATH=$PATH:$TMPDIR
+  '';
+
+  nativeBuildInputs = [ cmake bison ];
+
+  buildInputs = [ boost libedit libevent lz4 ncurses openssl protobuf readline zlib ]
+     ++ stdenv.lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ];
+
+  enableParallelBuilding = true;
+
+  outputs = [ "out" "static" ];
+
+  cmakeFlags = [
+    "-DCMAKE_SKIP_BUILD_RPATH=OFF" # To run libmysql/libmysql_api_test during build.
+    "-DWITH_SSL=yes"
+    "-DWITH_EMBEDDED_SERVER=yes"
+    "-DWITH_UNIT_TESTS=no"
+    "-DWITH_EDITLINE=system"
+    "-DWITH_LIBEVENT=system"
+    "-DWITH_LZ4=system"
+    "-DWITH_PROTOBUF=system"
+    "-DWITH_ZLIB=system"
+    "-DWITH_ARCHIVE_STORAGE_ENGINE=yes"
+    "-DWITH_BLACKHOLE_STORAGE_ENGINE=yes"
+    "-DWITH_FEDERATED_STORAGE_ENGINE=yes"
+    "-DHAVE_IPV6=yes"
+    "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
+    "-DMYSQL_DATADIR=/var/lib/mysql"
+    "-DINSTALL_INFODIR=share/mysql/docs"
+    "-DINSTALL_MANDIR=share/man"
+    "-DINSTALL_PLUGINDIR=lib/mysql/plugin"
+    "-DINSTALL_SCRIPTDIR=bin"
+    "-DINSTALL_INCLUDEDIR=include/mysql"
+    "-DINSTALL_DOCREADMEDIR=share/mysql"
+    "-DINSTALL_SUPPORTFILESDIR=share/mysql"
+    "-DINSTALL_MYSQLSHAREDIR=share/mysql"
+    "-DINSTALL_MYSQLTESTDIR="
+    "-DINSTALL_DOCDIR=share/mysql/docs"
+    "-DINSTALL_SHAREDIR=share/mysql"
+  ];
+
+  CXXFLAGS = "-fpermissive -std=c++11";
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
+
+  prePatch = ''
+    sed -i -e "s|/usr/bin/libtool|libtool|" cmake/libutils.cmake
+  '';
+  postInstall = ''
+    moveToOutput "lib/*.a" $static
+  '';
+
+  passthru = {
+    client = self;
+    connector-c = self;
+    server = self;
+    mysqlVersion = "5.6";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://www.mysql.com/;
+    description = "The world's most popular open source database";
+    platforms = platforms.unix;
+    license = with licenses; [
+      artistic1 bsd0 bsd2 bsd3 bsdOriginal
+      gpl2 lgpl2 lgpl21 mit publicDomain licenses.zlib
+    ];
+    maintainers = with maintainers; [ qyliss ];
+  };
+}; in self
diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/nixpkgs/pkgs/servers/sql/mysql/5.7.x.nix
index 249a5af5d480..249a5af5d480 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/jdbc/builder.sh b/nixpkgs/pkgs/servers/sql/mysql/jdbc/builder.sh
index 56336e041356..56336e041356 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 66e62b823d9a..66e62b823d9a 100644
--- a/pkgs/servers/sql/mysql/jdbc/default.nix
+++ b/nixpkgs/pkgs/servers/sql/mysql/jdbc/default.nix
diff --git a/pkgs/servers/sql/oracle-xe/default.nix b/nixpkgs/pkgs/servers/sql/oracle-xe/default.nix
index a50d623acbce..a50d623acbce 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 c77330bd2ace..c77330bd2ace 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 ef8b77ad1176..ef8b77ad1176 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 3fedf3fa8048..3fedf3fa8048 100644
--- a/pkgs/servers/sql/pgpool/default.nix
+++ b/nixpkgs/pkgs/servers/sql/pgpool/default.nix
diff --git a/pkgs/servers/sql/pgpool/pgpool-II-3.4.14-glibc-2.26.patch b/nixpkgs/pkgs/servers/sql/pgpool/pgpool-II-3.4.14-glibc-2.26.patch
index 6efffff0c6d9..6efffff0c6d9 100644
--- a/pkgs/servers/sql/pgpool/pgpool-II-3.4.14-glibc-2.26.patch
+++ b/nixpkgs/pkgs/servers/sql/pgpool/pgpool-II-3.4.14-glibc-2.26.patch
diff --git a/pkgs/servers/sql/postgresql/default.nix b/nixpkgs/pkgs/servers/sql/postgresql/default.nix
index 440ee15a5180..440ee15a5180 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 f2e814543dbf..f2e814543dbf 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 87a54471eca7..87a54471eca7 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 a8e5a54bc29a..a8e5a54bc29a 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 40fcaeb7ccab..40fcaeb7ccab 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 bccec1107b9a..bccec1107b9a 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 38e86fbfd8d6..38e86fbfd8d6 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 381a174838e5..381a174838e5 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 b835141e2ca7..b835141e2ca7 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 85ff50e2eae8..85ff50e2eae8 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 1a5aa91ae6ec..1a5aa91ae6ec 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 69c7a4513b6e..69c7a4513b6e 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 9058c443e37e..9058c443e37e 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 9f4eda2bde91..9f4eda2bde91 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 7dd6a5882b25..7dd6a5882b25 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 01dcd54d95e8..01dcd54d95e8 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 b3befc58295b..b3befc58295b 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 de9d7eb1305b..de9d7eb1305b 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/tds_fdw.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/tds_fdw.nix
index 3a4e0cba6026..3a4e0cba6026 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 ac0299208f81..ac0299208f81 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 5f2facf449e8..5f2facf449e8 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 87c82dd82073..87c82dd82073 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 ebce90d34518..ebce90d34518 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 fadeea90ac4b..fadeea90ac4b 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 3e6fd5e838a2..3e6fd5e838a2 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 959bf6a6caa4..959bf6a6caa4 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 6cd449769baa..6cd449769baa 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 355813ffe20e..355813ffe20e 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 f14af9dc2207..f14af9dc2207 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 d640d24bdaad..d640d24bdaad 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 969f80ff8fc7..969f80ff8fc7 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 fe95d2ee99f0..fe95d2ee99f0 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 4e40d8761526..4e40d8761526 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 0daf7533a604..0daf7533a604 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 17ec49d16131..17ec49d16131 100644
--- a/pkgs/servers/sql/virtuoso/7.x.nix
+++ b/nixpkgs/pkgs/servers/sql/virtuoso/7.x.nix
diff --git a/pkgs/servers/squid/4.nix b/nixpkgs/pkgs/servers/squid/4.nix
index f4abc1f3208e..f4abc1f3208e 100644
--- a/pkgs/servers/squid/4.nix
+++ b/nixpkgs/pkgs/servers/squid/4.nix
diff --git a/pkgs/servers/squid/default.nix b/nixpkgs/pkgs/servers/squid/default.nix
index 2fdbc29caedf..2fdbc29caedf 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 455409557592..455409557592 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 d41923758017..d41923758017 100644
--- a/pkgs/servers/syncserver/default.nix
+++ b/nixpkgs/pkgs/servers/syncserver/default.nix
diff --git a/pkgs/servers/tautulli/default.nix b/nixpkgs/pkgs/servers/tautulli/default.nix
index b19b4d13893e..b19b4d13893e 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 967eea25d3fb..967eea25d3fb 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 8651c157dab9..8651c157dab9 100644
--- a/pkgs/servers/teleport/default.nix
+++ b/nixpkgs/pkgs/servers/teleport/default.nix
diff --git a/pkgs/servers/traefik/default.nix b/nixpkgs/pkgs/servers/traefik/default.nix
index 469d5fb73f93..469d5fb73f93 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 fcea0f398e4e..fcea0f398e4e 100644
--- a/pkgs/servers/trezord/default.nix
+++ b/nixpkgs/pkgs/servers/trezord/default.nix
diff --git a/pkgs/servers/tt-rss/default.nix b/nixpkgs/pkgs/servers/tt-rss/default.nix
index ce8947bcdda6..ce8947bcdda6 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 6fad061ce996..6fad061ce996 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 27416537e331..27416537e331 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 702b95b3f0e3..702b95b3f0e3 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 d0b279eb859b..d0b279eb859b 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 bae43412e784..bae43412e784 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 e05d9e919d17..e05d9e919d17 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 4f5d9636fe6b..4f5d9636fe6b 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 9e9816c941d9..9e9816c941d9 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 1530480dc4bf..1530480dc4bf 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 52866784faa9..52866784faa9 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 d29d600425ff..d29d600425ff 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 9bccd5b99fb0..9bccd5b99fb0 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 4304dc229e35..4304dc229e35 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 bad068245f3d..bad068245f3d 100644
--- a/pkgs/servers/unifi/default.nix
+++ b/nixpkgs/pkgs/servers/unifi/default.nix
diff --git a/pkgs/servers/uwsgi/default.nix b/nixpkgs/pkgs/servers/uwsgi/default.nix
index 1e8464874727..1e8464874727 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 51bc6da33f6c..51bc6da33f6c 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 40d08841eac5..40d08841eac5 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 2ccb0419c042..2ccb0419c042 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 711bc1cf78f5..711bc1cf78f5 100644
--- a/pkgs/servers/varnish/dynamic.nix
+++ b/nixpkgs/pkgs/servers/varnish/dynamic.nix
diff --git a/pkgs/servers/varnish/geoip.nix b/nixpkgs/pkgs/servers/varnish/geoip.nix
index d1790252065c..d1790252065c 100644
--- a/pkgs/servers/varnish/geoip.nix
+++ b/nixpkgs/pkgs/servers/varnish/geoip.nix
diff --git a/pkgs/servers/varnish/modules.nix b/nixpkgs/pkgs/servers/varnish/modules.nix
index 7775221d1638..7775221d1638 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 f468ac58e6cd..f468ac58e6cd 100644
--- a/pkgs/servers/varnish/packages.nix
+++ b/nixpkgs/pkgs/servers/varnish/packages.nix
diff --git a/pkgs/servers/varnish/rtstatus.nix b/nixpkgs/pkgs/servers/varnish/rtstatus.nix
index 99c0bb176597..99c0bb176597 100644
--- a/pkgs/servers/varnish/rtstatus.nix
+++ b/nixpkgs/pkgs/servers/varnish/rtstatus.nix
diff --git a/pkgs/servers/web-apps/codimd/CodeMirror/default.nix b/nixpkgs/pkgs/servers/web-apps/codimd/CodeMirror/default.nix
index 2dba13d09143..2dba13d09143 100644
--- a/pkgs/servers/web-apps/codimd/CodeMirror/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/codimd/CodeMirror/default.nix
diff --git a/pkgs/servers/web-apps/codimd/CodeMirror/deps.json b/nixpkgs/pkgs/servers/web-apps/codimd/CodeMirror/deps.json
index 672e413a4a9e..672e413a4a9e 100644
--- a/pkgs/servers/web-apps/codimd/CodeMirror/deps.json
+++ b/nixpkgs/pkgs/servers/web-apps/codimd/CodeMirror/deps.json
diff --git a/pkgs/servers/web-apps/codimd/CodeMirror/generate.sh b/nixpkgs/pkgs/servers/web-apps/codimd/CodeMirror/generate.sh
index 7a9fa8cb1cf1..7a9fa8cb1cf1 100755
--- a/pkgs/servers/web-apps/codimd/CodeMirror/generate.sh
+++ b/nixpkgs/pkgs/servers/web-apps/codimd/CodeMirror/generate.sh
diff --git a/pkgs/servers/web-apps/codimd/CodeMirror/node-packages.nix b/nixpkgs/pkgs/servers/web-apps/codimd/CodeMirror/node-packages.nix
index ad868f9955d1..ad868f9955d1 100644
--- a/pkgs/servers/web-apps/codimd/CodeMirror/node-packages.nix
+++ b/nixpkgs/pkgs/servers/web-apps/codimd/CodeMirror/node-packages.nix
diff --git a/pkgs/servers/web-apps/codimd/CodeMirror/node.nix b/nixpkgs/pkgs/servers/web-apps/codimd/CodeMirror/node.nix
index fd7fc4dfe0ce..fd7fc4dfe0ce 100644
--- a/pkgs/servers/web-apps/codimd/CodeMirror/node.nix
+++ b/nixpkgs/pkgs/servers/web-apps/codimd/CodeMirror/node.nix
diff --git a/pkgs/servers/web-apps/codimd/default.nix b/nixpkgs/pkgs/servers/web-apps/codimd/default.nix
index 79ad58dddd8d..79ad58dddd8d 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/deps.json b/nixpkgs/pkgs/servers/web-apps/codimd/deps.json
index 18eedabdc8e5..18eedabdc8e5 100644
--- a/pkgs/servers/web-apps/codimd/deps.json
+++ b/nixpkgs/pkgs/servers/web-apps/codimd/deps.json
diff --git a/pkgs/servers/web-apps/codimd/generate.sh b/nixpkgs/pkgs/servers/web-apps/codimd/generate.sh
index 0089c750dcc8..0089c750dcc8 100755
--- a/pkgs/servers/web-apps/codimd/generate.sh
+++ b/nixpkgs/pkgs/servers/web-apps/codimd/generate.sh
diff --git a/pkgs/servers/web-apps/codimd/js-sequence-diagrams/default.nix b/nixpkgs/pkgs/servers/web-apps/codimd/js-sequence-diagrams/default.nix
index 04dc2d6054a3..04dc2d6054a3 100644
--- a/pkgs/servers/web-apps/codimd/js-sequence-diagrams/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/codimd/js-sequence-diagrams/default.nix
diff --git a/pkgs/servers/web-apps/codimd/node-packages.nix b/nixpkgs/pkgs/servers/web-apps/codimd/node-packages.nix
index 43a2eb351a6d..43a2eb351a6d 100644
--- a/pkgs/servers/web-apps/codimd/node-packages.nix
+++ b/nixpkgs/pkgs/servers/web-apps/codimd/node-packages.nix
diff --git a/pkgs/tools/networking/airfield/node.nix b/nixpkgs/pkgs/servers/web-apps/codimd/node.nix
index 0983d3e127be..0983d3e127be 100644
--- a/pkgs/tools/networking/airfield/node.nix
+++ b/nixpkgs/pkgs/servers/web-apps/codimd/node.nix
diff --git a/pkgs/servers/web-apps/cryptpad/bower-packages.nix b/nixpkgs/pkgs/servers/web-apps/cryptpad/bower-packages.nix
index 72511c16eeba..72511c16eeba 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 679cedf25227..679cedf25227 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 fd3c93368912..fd3c93368912 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 f53a1dcf66b1..f53a1dcf66b1 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 9d2b233f767b..9d2b233f767b 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 cae300a53f40..cae300a53f40 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/fileshelter/default.nix b/nixpkgs/pkgs/servers/web-apps/fileshelter/default.nix
index d7510e7d1e03..d7510e7d1e03 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 098b8f3d7d7a..098b8f3d7d7a 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 dc18be7a33db..dc18be7a33db 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 d6a5128b8130..d6a5128b8130 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 c3259a2709c9..c3259a2709c9 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 a8163f33e5c0..a8163f33e5c0 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 17cb8be739f6..17cb8be739f6 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 5af8ef860b2f..5af8ef860b2f 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/morty/default.nix b/nixpkgs/pkgs/servers/web-apps/morty/default.nix
index e4dd9b0f2dc7..e4dd9b0f2dc7 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 643fc5bb7636..643fc5bb7636 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 c4f49b36bf80..c4f49b36bf80 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 946606e37013..946606e37013 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 9b96756e8299..9b96756e8299 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 59d3a387b606..59d3a387b606 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 615efa3b3672..615efa3b3672 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 ebca3eae4505..ebca3eae4505 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 939976b0a269..939976b0a269 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/virtlyst/add-admin-password-env.patch b/nixpkgs/pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch
index e20acdb04a9e..e20acdb04a9e 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 0c51b6b13cdd..0c51b6b13cdd 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 eafe916d02ca..eafe916d02ca 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 086e93959800..086e93959800 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 4a9af9d329cc..4a9af9d329cc 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 30ab9374cba0..30ab9374cba0 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 52cb1e750a64..52cb1e750a64 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 cd7b47fc7b05..cd7b47fc7b05 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 751a35072bcf..751a35072bcf 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/builder.sh b/nixpkgs/pkgs/servers/x11/xorg/builder.sh
index 5a832cb14d53..5a832cb14d53 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 b012570ae133..b012570ae133 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 a5869b21c581..a5869b21c581 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 21e61bc54d0e..21e61bc54d0e 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 fe079eeb42a7..fe079eeb42a7 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 10f54198f7fb..10f54198f7fb 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 1d0ec88761d4..1d0ec88761d4 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 4ab5e2ae160b..4ab5e2ae160b 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 7b6299105b1d..7b6299105b1d 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 26c2721e2407..26c2721e2407 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 0a008227b9fb..0a008227b9fb 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 06f54fd52073..06f54fd52073 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 e6bb87fab3fe..e6bb87fab3fe 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 22f6ce456732..22f6ce456732 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 b1191980d77f..b1191980d77f 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 190b383676d4..190b383676d4 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 7a95916da165..7a95916da165 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 9b0f778426ed..9b0f778426ed 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 9d9c802002b2..9d9c802002b2 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 b4afebce57c7..b4afebce57c7 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 db47f8afe015..db47f8afe015 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 276aeca7c846..276aeca7c846 100755
--- a/pkgs/servers/x11/xquartz/xinitrc
+++ b/nixpkgs/pkgs/servers/x11/xquartz/xinitrc
diff --git a/pkgs/servers/xinetd/default.nix b/nixpkgs/pkgs/servers/xinetd/default.nix
index 445c6c57bbf1..445c6c57bbf1 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 bbd0a66909fe..bbd0a66909fe 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 b0d3dccf30f2..b0d3dccf30f2 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 5db000e7a4a2..5db000e7a4a2 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 0e6fcd5e9896..0e6fcd5e9896 100644
--- a/pkgs/servers/xmpp/openfire/default.nix
+++ b/nixpkgs/pkgs/servers/xmpp/openfire/default.nix
diff --git a/pkgs/servers/xmpp/prosody/default.nix b/nixpkgs/pkgs/servers/xmpp/prosody/default.nix
index 928c48329656..928c48329656 100644
--- a/pkgs/servers/xmpp/prosody/default.nix
+++ b/nixpkgs/pkgs/servers/xmpp/prosody/default.nix
diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/nixpkgs/pkgs/servers/xmpp/pyIRCt/default.nix
index 8df8499d11eb..8df8499d11eb 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 76861ab842b5..76861ab842b5 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 abd7ffccbb5f..abd7ffccbb5f 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 5a052df9e0a5..5a052df9e0a5 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 53aaf9b25f7d..53aaf9b25f7d 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 5bacaf2982e9..5bacaf2982e9 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 21f40858ea28..21f40858ea28 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 e5e33c76d205..e5e33c76d205 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 b78282ab6e4c..b78282ab6e4c 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 a79ec90213a0..a79ec90213a0 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 560aef16644c..560aef16644c 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/default.nix b/nixpkgs/pkgs/shells/bash/bash-completion/default.nix
index b5f600da8f7e..b5f600da8f7e 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 488373109625..488373109625 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 5ac117cf1e5e..5ac117cf1e5e 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/update-patch-set.sh b/nixpkgs/pkgs/shells/bash/update-patch-set.sh
index 003c7a26d201..003c7a26d201 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 f8d592748b3f..f8d592748b3f 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 c3c2da329a9b..c3c2da329a9b 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 c66768151316..c66768151316 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 80b0f3860514..80b0f3860514 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 789ddaf4d9bb..789ddaf4d9bb 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 32d87d7cc1bf..32d87d7cc1bf 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 445e961c6499..445e961c6499 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 5e4569f0a15c..5e4569f0a15c 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 383387b4056c..383387b4056c 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 833947a6ddb8..833947a6ddb8 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 d16704b71d5e..d16704b71d5e 100644
--- a/pkgs/shells/ksh/default.nix
+++ b/nixpkgs/pkgs/shells/ksh/default.nix
diff --git a/pkgs/shells/mksh/default.nix b/nixpkgs/pkgs/shells/mksh/default.nix
index 2115e17c332b..2115e17c332b 100644
--- a/pkgs/shells/mksh/default.nix
+++ b/nixpkgs/pkgs/shells/mksh/default.nix
diff --git a/pkgs/shells/oh/default.nix b/nixpkgs/pkgs/shells/oh/default.nix
index 2e200a74f7b4..2e200a74f7b4 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 b4b98f10c3aa..b4b98f10c3aa 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 d019457ab8a1..d019457ab8a1 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 78d508840ba8..78d508840ba8 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 8a5956161e0d..8a5956161e0d 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 298c4a1c32f4..298c4a1c32f4 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 d061c888f60a..d061c888f60a 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 eecffb376ab3..eecffb376ab3 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 3063e991d98a..3063e991d98a 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 43dd8a40480c..43dd8a40480c 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 12d39c5bdab5..12d39c5bdab5 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 0ea3c8d158d0..0ea3c8d158d0 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 cf22207ef09c..cf22207ef09c 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 b74b2fc43f30..b74b2fc43f30 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/default.nix
diff --git a/pkgs/shells/zsh/gradle-completion/default.nix b/nixpkgs/pkgs/shells/zsh/gradle-completion/default.nix
index b9047a93a41f..b9047a93a41f 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 0051df7073ba..38e45693ad5e 100644
--- a/pkgs/shells/zsh/grml-zsh-config/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix
@@ -1,7 +1,4 @@
-{ stdenv, fetchFromGitHub, lib
-, zsh, coreutils, inetutils, procps, txt2tags }:
-
-with lib;
+{ stdenv, fetchFromGitHub, lib, txt2tags }:
 
 stdenv.mkDerivation rec {
   name = "grml-zsh-config-${version}";
@@ -14,8 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1b794c3hfhw51aqp8dg8smxqjv4x518rs1ib4pdglc4d785rlq1k";
   };
 
-  buildInputs = [ zsh coreutils txt2tags procps ]
-    ++ optional stdenv.isLinux [ inetutils ];
+  nativeBuildInputs = [ txt2tags ];
 
   buildPhase = ''
     cd doc
@@ -31,7 +27,7 @@ stdenv.mkDerivation rec {
     ln -s grmlzshrc.5.gz $out/share/man/man5/grml-zsh-config.5.gz
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "grml's zsh setup";
     homepage = http://grml.org/zsh/;
     license = licenses.gpl2;
diff --git a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix b/nixpkgs/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix
index 1794979bedf4..34d566f1239b 100644
--- a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix
@@ -10,8 +10,6 @@ stdenv.mkDerivation {
     sha256 = "1xf451c349fxnqbvsb07y9r1iqrwslx6x4b6drmnqqqy4yx1r5dj";
   };
 
-  buildInputs = [ zsh ];
-
   installPhase = ''
     chmod +x lambda-mod.zsh-theme # only executable scripts are found by `patchShebangs`
     patchShebangs .
diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/nixpkgs/pkgs/shells/zsh/nix-zsh-completions/default.nix
index 0a5c3ef666e2..0a5c3ef666e2 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 38439b4427c8..38439b4427c8 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 08b0daa4387c..08b0daa4387c 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 28b116523ac0..28b116523ac0 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 6af1869da7ee..78908f138618 100644
--- a/pkgs/shells/zsh/zsh-autosuggestions/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/zsh-autosuggestions/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "1h8h2mz9wpjpymgl2p7pc146c1jgb3dggpvzwm9ln3in336wl95c";
   };
 
-  buildInputs = [ zsh ];
+  nativeBuildInputs = [ zsh ];
 
   installPhase = ''
     install -D zsh-autosuggestions.zsh \
diff --git a/pkgs/shells/zsh/zsh-command-time/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-command-time/default.nix
index c81c1ea46c5f..c81c1ea46c5f 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 726f2b7ad73d..726f2b7ad73d 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 735d6a2b7619..735d6a2b7619 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 03850d7e5c12..03850d7e5c12 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-git-prompt/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-git-prompt/default.nix
index 6aadf3163d34..6aadf3163d34 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 42de7d48d831..42de7d48d831 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-powerlevel9k/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-powerlevel9k/default.nix
index 30c45ea3c9bf..30c45ea3c9bf 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 efb62c2a0fd8..efb62c2a0fd8 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 b7b44098fd7a..78cab65138a6 100644
--- a/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "0zmq66dzasmr5pwribyh4kbkk23jxbpdw4rjxx0i7dx8jjp2lzl4";
   };
 
-  buildInputs = [ zsh ];
+  nativeBuildInputs = [ zsh ];
 
   installFlags = "PREFIX=$(out)";
 
diff --git a/pkgs/shells/zsh/zsh-you-should-use/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-you-should-use/default.nix
index c44483d3744f..c44483d3744f 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 8ece43f87b0f..8ece43f87b0f 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 1df05099fbf5..1df05099fbf5 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 da468d56a2cd..da468d56a2cd 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 3bc4cd9a8faa..3bc4cd9a8faa 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 4c7380118f7d..4c7380118f7d 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 7cb6a58f180b..7cb6a58f180b 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 091c9044d93f..091c9044d93f 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 4c8f8ebd7eb2..4c8f8ebd7eb2 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 d0da8c1b65c2..d0da8c1b65c2 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 f7a40bb0d0e7..f7a40bb0d0e7 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 a299879693c8..a299879693c8 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 f50ccc8d32ee..f50ccc8d32ee 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 0da80ec5ce56..0da80ec5ce56 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 1f752f021524..1f752f021524 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 dbb4a0564558..dbb4a0564558 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 fbff4575e5a4..fbff4575e5a4 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 79bf21ab4730..79bf21ab4730 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 89e2a7a8031c..89e2a7a8031c 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 273fc55c7552..273fc55c7552 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 1ef2ab52029b..1ef2ab52029b 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 be79e7626c55..be79e7626c55 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 ebcedce60b87..ebcedce60b87 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 ff0eec893f2f..ff0eec893f2f 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 ca7e84502ab3..ca7e84502ab3 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 37471e9ce426..37471e9ce426 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 45ac0d5f9acd..45ac0d5f9acd 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 447189756821..447189756821 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 b97fd9967eae..b97fd9967eae 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 cf484fd92533..cf484fd92533 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 8e22a274974a..8e22a274974a 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 543c1c838492..543c1c838492 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 69d08c5e981a..69d08c5e981a 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 6118585d545f..6118585d545f 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 b160a748d8dc..b160a748d8dc 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 6118585d545f..6118585d545f 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 64583f80fa8f..64583f80fa8f 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 390c7f1123ec..390c7f1123ec 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 d1ee317a2bcf..d1ee317a2bcf 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 8d513625df21..8d513625df21 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 ba53a6f1d142..ba53a6f1d142 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 a8311f49609a..a8311f49609a 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 06f28bc33c69..06f28bc33c69 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 9491232b5387..9491232b5387 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 fb3bd3126191..fb3bd3126191 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 83f704617a46..83f704617a46 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 7bd82b4ab2a5..7bd82b4ab2a5 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 8be674be3103..8be674be3103 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 89832b3bbad2..89832b3bbad2 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 5ea50b5eb268..5ea50b5eb268 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 93dd78a903ce..93dd78a903ce 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 6c31a16f2fd5..6c31a16f2fd5 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 793229f8bbb0..793229f8bbb0 100644
--- a/pkgs/test/default.nix
+++ b/nixpkgs/pkgs/test/default.nix
diff --git a/pkgs/test/kernel.nix b/nixpkgs/pkgs/test/kernel.nix
index 86f1b8d8e9ac..86f1b8d8e9ac 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 bda3f0be84a6..bda3f0be84a6 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 73b359ffe6a4..73b359ffe6a4 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 9e89a1c096da..9e89a1c096da 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 26fb8c28dd59..26fb8c28dd59 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 a3a051eb48c4..a3a051eb48c4 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 bbf68218aa09..bbf68218aa09 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 6956f65dbbcc..6956f65dbbcc 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 5478846d563f..5478846d563f 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 6dee0a27a79a..6dee0a27a79a 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 3e68d96004f2..3e68d96004f2 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 65f7e4c11ba1..65f7e4c11ba1 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 2d7299c2d462..2d7299c2d462 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 06f28bc33c69..06f28bc33c69 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 4db10e75086e..4db10e75086e 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 0253a26d5d2c..0253a26d5d2c 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 35e5ee0d90f7..35e5ee0d90f7 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 c9488fe43e55..c9488fe43e55 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 4efd86ca63fa..4efd86ca63fa 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 51f2f5ec2494..51f2f5ec2494 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 c9bf7141804c..c9bf7141804c 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 488c97ad36b5..488c97ad36b5 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 0d764a4cbd10..0d764a4cbd10 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 cf6ee5add98f..cf6ee5add98f 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 aff7b8adfc23..aff7b8adfc23 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 46f2cb33bb06..46f2cb33bb06 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 9387c62c2a51..9387c62c2a51 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 1d119220e585..1d119220e585 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 232c4a636fb8..232c4a636fb8 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 3283cea1db52..3283cea1db52 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 c750a5ce1c66..c750a5ce1c66 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 f808858e091a..f808858e091a 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 1a7fc91311e5..1a7fc91311e5 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 cf2227403b01..cf2227403b01 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 f33e15e59cc6..f33e15e59cc6 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 5d3810c7d64d..5d3810c7d64d 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 7863542d1900..7863542d1900 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 f7d8914722a9..f7d8914722a9 100644
--- a/pkgs/tools/X11/ksuperkey/default.nix
+++ b/nixpkgs/pkgs/tools/X11/ksuperkey/default.nix
diff --git a/pkgs/tools/X11/ncview/default.nix b/nixpkgs/pkgs/tools/X11/ncview/default.nix
index 1f793aa6c4c9..1f793aa6c4c9 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 eda5703d6a86..eda5703d6a86 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 2c4807e4661f..2c4807e4661f 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 516ed9da272b..516ed9da272b 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 2e02338631b4..2e02338631b4 100644
--- a/pkgs/tools/X11/obconf/default.nix
+++ b/nixpkgs/pkgs/tools/X11/obconf/default.nix
diff --git a/pkgs/tools/X11/oblogout/default.nix b/nixpkgs/pkgs/tools/X11/oblogout/default.nix
index 33470beca2de..33470beca2de 100644
--- a/pkgs/tools/X11/oblogout/default.nix
+++ b/nixpkgs/pkgs/tools/X11/oblogout/default.nix
diff --git a/pkgs/tools/X11/oblogout/oblogout-0.3-fixes.patch b/nixpkgs/pkgs/tools/X11/oblogout/oblogout-0.3-fixes.patch
index c58103c6d407..c58103c6d407 100644
--- a/pkgs/tools/X11/oblogout/oblogout-0.3-fixes.patch
+++ b/nixpkgs/pkgs/tools/X11/oblogout/oblogout-0.3-fixes.patch
diff --git a/pkgs/tools/X11/primus/default.nix b/nixpkgs/pkgs/tools/X11/primus/default.nix
index bf3ff7c65281..bf3ff7c65281 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 13d7e06c7304..13d7e06c7304 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 aa5e346334a3..aa5e346334a3 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 ea661b0f8c7b..ea661b0f8c7b 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 1323da585c89..1323da585c89 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 92f24f2b4aa4..92f24f2b4aa4 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 6b83afa332ba..6b83afa332ba 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 9f45bbe30871..9f45bbe30871 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 b8714fc9ecaf..b8714fc9ecaf 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 16462f5243b7..16462f5243b7 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 af9394a84fa5..af9394a84fa5 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 2b58dd6c9115..2b58dd6c9115 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 153ff45d2a70..153ff45d2a70 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 aa839e6d684d..aa839e6d684d 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 47b54bec312c..47b54bec312c 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 a5a75c9df4f5..a5a75c9df4f5 100644
--- a/pkgs/tools/X11/wayv/default.nix
+++ b/nixpkgs/pkgs/tools/X11/wayv/default.nix
diff --git a/pkgs/tools/X11/winswitch/default.nix b/nixpkgs/pkgs/tools/X11/winswitch/default.nix
index cd9d6aecdefb..cd9d6aecdefb 100644
--- a/pkgs/tools/X11/winswitch/default.nix
+++ b/nixpkgs/pkgs/tools/X11/winswitch/default.nix
diff --git a/pkgs/tools/X11/wmctrl/64-bit-data.patch b/nixpkgs/pkgs/tools/X11/wmctrl/64-bit-data.patch
index 3ec1c913ffea..3ec1c913ffea 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 e4cb70c8f24d..e4cb70c8f24d 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 4200293ed080..4200293ed080 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 c01aa8dc75fa..c01aa8dc75fa 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 5d94943daf90..5d94943daf90 100644
--- a/pkgs/tools/X11/wpgtk/default.nix
+++ b/nixpkgs/pkgs/tools/X11/wpgtk/default.nix
diff --git a/pkgs/tools/X11/x11vnc/default.nix b/nixpkgs/pkgs/tools/X11/x11vnc/default.nix
index 169f420357e6..169f420357e6 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 cb01d0a4d4a4..cb01d0a4d4a4 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 5c8e3d4f8fb6..5c8e3d4f8fb6 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 5a08cf5c817e..5a08cf5c817e 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 79ef4cb56dcb..79ef4cb56dcb 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 142d7d17fe77..142d7d17fe77 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 987293878d82..987293878d82 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 d4620b5d9071..d4620b5d9071 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 e3f8de1a8046..e3f8de1a8046 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 4e4e49bd9468..4e4e49bd9468 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 2857ea6c7be4..2857ea6c7be4 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 2f925b11ba5c..2f925b11ba5c 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 fae2d56fbbe8..fae2d56fbbe8 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 f06b4cc6b378..f06b4cc6b378 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 1d42f791fb5c..1d42f791fb5c 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 c72fab015d9f..c72fab015d9f 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 44016b801e5d..44016b801e5d 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 bb6abfa9b586..bb6abfa9b586 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 76493dfb73ea..76493dfb73ea 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 edafbf5525bf..edafbf5525bf 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 43b46fcb8d7b..43b46fcb8d7b 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 e3bbd5990757..e3bbd5990757 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 e6f6622f85ac..e6f6622f85ac 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 f5a264108359..f5a264108359 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 d9c9042467c0..d9c9042467c0 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 30903e448563..30903e448563 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 a58d16ab82e8..a58d16ab82e8 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 fd944f400446..fd944f400446 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 463df6ad9351..463df6ad9351 100644
--- a/pkgs/tools/X11/xmagnify/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xmagnify/default.nix
diff --git a/pkgs/tools/X11/xnee/default.nix b/nixpkgs/pkgs/tools/X11/xnee/default.nix
index a84f101cdf7b..a84f101cdf7b 100644
--- a/pkgs/tools/X11/xnee/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xnee/default.nix
diff --git a/pkgs/tools/X11/xosview2/default.nix b/nixpkgs/pkgs/tools/X11/xosview2/default.nix
index 8acabeef2188..8acabeef2188 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 435f2b2e9801..435f2b2e9801 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 efafbb3692ed..efafbb3692ed 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 ac8107235be5..ac8107235be5 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 d6fab2b19103..d6fab2b19103 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 f91e53d1e493..f91e53d1e493 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 3dbb6fd179ff..3dbb6fd179ff 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 567db3fc3865..567db3fc3865 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 4e9f88608927..4e9f88608927 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 117a612381f6..117a612381f6 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 e54ced714e76..e54ced714e76 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 4f9b7bcb42e9..4f9b7bcb42e9 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 a7a7c2b6c0d5..a7a7c2b6c0d5 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 bae8d1efc14d..bae8d1efc14d 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 2f84711e61c4..2f84711e61c4 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 8db15a8f0334..8db15a8f0334 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 043514ebb436..043514ebb436 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 368012b468f3..368012b468f3 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 b6b87fffb47b..b6b87fffb47b 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 dbbdb0c04e91..dbbdb0c04e91 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 d1867e3b077b..d1867e3b077b 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 3314089d746c..3314089d746c 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 7ece3acbd679..7ece3acbd679 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 02386a135f11..02386a135f11 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 d0731c1f5996..d0731c1f5996 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 eaba52251509..eaba52251509 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 37bf0e6c45d3..37bf0e6c45d3 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 891a6ecb5962..891a6ecb5962 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 5d4ba0bfbc8c..5d4ba0bfbc8c 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 e03e7f345351..e03e7f345351 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 680a18e7e2d3..680a18e7e2d3 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 03b0ff5c0016..03b0ff5c0016 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 c319c47ea7e4..c319c47ea7e4 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 44eb3731d379..44eb3731d379 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 d2b6a5dca9ff..d2b6a5dca9ff 100644
--- a/pkgs/tools/admin/awslogs/default.nix
+++ b/nixpkgs/pkgs/tools/admin/awslogs/default.nix
diff --git a/pkgs/tools/admin/bluemix-cli/default.nix b/nixpkgs/pkgs/tools/admin/bluemix-cli/default.nix
index 8b6395d85d04..8b6395d85d04 100644
--- a/pkgs/tools/admin/bluemix-cli/default.nix
+++ b/nixpkgs/pkgs/tools/admin/bluemix-cli/default.nix
diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/nixpkgs/pkgs/tools/admin/bubblewrap/default.nix
index 3ac9e3c0e946..3ac9e3c0e946 100644
--- a/pkgs/tools/admin/bubblewrap/default.nix
+++ b/nixpkgs/pkgs/tools/admin/bubblewrap/default.nix
diff --git a/pkgs/tools/admin/certbot/default.nix b/nixpkgs/pkgs/tools/admin/certbot/default.nix
index 782af149ed6a..782af149ed6a 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 f53ef4a16fa6..f53ef4a16fa6 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 a4b119f126a4..a4b119f126a4 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 a6d8a046907f..a6d8a046907f 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 e6ce5d077984..e6ce5d077984 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 4742bc00851b..4742bc00851b 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 7e8c1bccc3e8..7e8c1bccc3e8 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 9b784e7ca112..9b784e7ca112 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 699c86b5fe31..699c86b5fe31 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 71bef3805441..71bef3805441 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/eksctl/default.nix b/nixpkgs/pkgs/tools/admin/eksctl/default.nix
index bb4c89dd4dc4..bb4c89dd4dc4 100644
--- a/pkgs/tools/admin/eksctl/default.nix
+++ b/nixpkgs/pkgs/tools/admin/eksctl/default.nix
diff --git a/pkgs/tools/admin/fastlane/Gemfile b/nixpkgs/pkgs/tools/admin/fastlane/Gemfile
index 1fa8dbca63b1..1fa8dbca63b1 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 88162a3432d9..88162a3432d9 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 8aba7524008b..8aba7524008b 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 5afad1683c99..5afad1683c99 100644
--- a/pkgs/tools/admin/fastlane/gemset.nix
+++ b/nixpkgs/pkgs/tools/admin/fastlane/gemset.nix
diff --git a/pkgs/tools/admin/fastlane/update b/nixpkgs/pkgs/tools/admin/fastlane/update
index 22d1e52e2977..22d1e52e2977 100755
--- a/pkgs/tools/admin/fastlane/update
+++ b/nixpkgs/pkgs/tools/admin/fastlane/update
diff --git a/pkgs/tools/admin/gixy/default.nix b/nixpkgs/pkgs/tools/admin/gixy/default.nix
index ab5aad6d68cd..ab5aad6d68cd 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 d120969d8fb8..d120969d8fb8 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 bb52c5a0bc4a..bb52c5a0bc4a 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 0b3b5d287271..0b3b5d287271 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 64ec6cdb1b65..64ec6cdb1b65 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 ec31d3ebbe93..ec31d3ebbe93 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 d4ee4d612932..d4ee4d612932 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 1225441392c4..1225441392c4 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 577d439c805a..577d439c805a 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 b0bb63984f0d..b0bb63984f0d 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 688ff3c7ca08..688ff3c7ca08 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 880ff331c933..880ff331c933 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 aa22e10b95da..aa22e10b95da 100644
--- a/pkgs/tools/admin/mycli/default.nix
+++ b/nixpkgs/pkgs/tools/admin/mycli/default.nix
diff --git a/pkgs/tools/admin/mycli/fix-tests.patch b/nixpkgs/pkgs/tools/admin/mycli/fix-tests.patch
index e67370bc824a..e67370bc824a 100644
--- a/pkgs/tools/admin/mycli/fix-tests.patch
+++ b/nixpkgs/pkgs/tools/admin/mycli/fix-tests.patch
diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/nixpkgs/pkgs/tools/admin/nomachine-client/default.nix
index bc9aa6bf3793..bc9aa6bf3793 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 bddfe1adee53..bddfe1adee53 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 89129ccb25f6..89129ccb25f6 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 25b8bdb65856..25b8bdb65856 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 de7714aced8d..de7714aced8d 100644
--- a/pkgs/tools/admin/oxidized/gemset.nix
+++ b/nixpkgs/pkgs/tools/admin/oxidized/gemset.nix
diff --git a/pkgs/tools/admin/procs/default.nix b/nixpkgs/pkgs/tools/admin/procs/default.nix
index 7c1e743a06e2..7c1e743a06e2 100644
--- a/pkgs/tools/admin/procs/default.nix
+++ b/nixpkgs/pkgs/tools/admin/procs/default.nix
diff --git a/pkgs/tools/admin/pulumi/default.nix b/nixpkgs/pkgs/tools/admin/pulumi/default.nix
index 12734cdcf9a6..12734cdcf9a6 100644
--- a/pkgs/tools/admin/pulumi/default.nix
+++ b/nixpkgs/pkgs/tools/admin/pulumi/default.nix
diff --git a/pkgs/tools/admin/salt/default.nix b/nixpkgs/pkgs/tools/admin/salt/default.nix
index 13bba0860c49..13bba0860c49 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 f7560b1fc56d..f7560b1fc56d 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 4bf24e3092d7..4bf24e3092d7 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 b246c7712ec9..b246c7712ec9 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 f6f5923eb4ab..f6f5923eb4ab 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 59edaff5f94e..59edaff5f94e 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 f5be7719d0d2..f5be7719d0d2 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 f8e893078157..f8e893078157 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 ae8e5cac68c0..ae8e5cac68c0 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 37a0f47c7afe..37a0f47c7afe 100644
--- a/pkgs/tools/admin/tigervnc/default.nix
+++ b/nixpkgs/pkgs/tools/admin/tigervnc/default.nix
diff --git a/pkgs/tools/admin/tightvnc/default.nix b/nixpkgs/pkgs/tools/admin/tightvnc/default.nix
index 5a76b500d149..5a76b500d149 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 73a81fcff875..73a81fcff875 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 0d983ad98ea1..0d983ad98ea1 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 d52995281347..d52995281347 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 0014febf40e4..0014febf40e4 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 e305a1739f7c..e305a1739f7c 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 d8a874d0b2e9..d8a874d0b2e9 100644
--- a/pkgs/tools/archivers/cabextract/default.nix
+++ b/nixpkgs/pkgs/tools/archivers/cabextract/default.nix
diff --git a/pkgs/tools/archivers/cpio/CVE-2016-2037-out-of-bounds-write.patch b/nixpkgs/pkgs/tools/archivers/cpio/CVE-2016-2037-out-of-bounds-write.patch
index 90ddeff9790e..90ddeff9790e 100644
--- a/pkgs/tools/archivers/cpio/CVE-2016-2037-out-of-bounds-write.patch
+++ b/nixpkgs/pkgs/tools/archivers/cpio/CVE-2016-2037-out-of-bounds-write.patch
diff --git a/pkgs/tools/archivers/cpio/default.nix b/nixpkgs/pkgs/tools/archivers/cpio/default.nix
index 44943109ee18..44943109ee18 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 57a8a8e97380..57a8a8e97380 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 288a2a31ed05..288a2a31ed05 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 cb73233dcb46..cb73233dcb46 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 c2e7f75fc7fc..c2e7f75fc7fc 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 dc9796cc9e3a..dc9796cc9e3a 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 7af30e313f45..7af30e313f45 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 42245c92c0aa..42245c92c0aa 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 a9787c4a9088..a9787c4a9088 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 3b212b186aac..3b212b186aac 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 4dc88f07c0bd..4dc88f07c0bd 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 7f813dd76c89..7f813dd76c89 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 3c515b8c195d..3c515b8c195d 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 6ebfa251955d..6ebfa251955d 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 f99ee963dbe6..f99ee963dbe6 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 d53499007569..d53499007569 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 a03c9610e357..a03c9610e357 100644
--- a/pkgs/tools/archivers/sharutils/default.nix
+++ b/nixpkgs/pkgs/tools/archivers/sharutils/default.nix
diff --git a/pkgs/tools/archivers/unar/default.nix b/nixpkgs/pkgs/tools/archivers/unar/default.nix
index 1104548f77f8..1104548f77f8 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 217a8ab35a9e..217a8ab35a9e 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 89bb816aa579..89bb816aa579 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 e5c8dda23b6a..e5c8dda23b6a 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 b9c549d670bf..b9c549d670bf 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 2a51e4d7bc90..2a51e4d7bc90 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 41d6a5cd217b..41d6a5cd217b 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 3febb557bf8b..3febb557bf8b 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 3bcc21c7c0d8..3bcc21c7c0d8 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 81b96b8df7db..81b96b8df7db 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 11007195b1ff..11007195b1ff 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 d4c7f752975e..d4c7f752975e 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 a5675f4fb7c0..a5675f4fb7c0 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 3aad17bddd78..3aad17bddd78 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 98ebf53c4782..98ebf53c4782 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 52d07987b333..52d07987b333 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 e9320e125cf6..e9320e125cf6 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 cdf189e82df5..cdf189e82df5 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 15dbbfe4c533..15dbbfe4c533 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 4055d2fab512..4055d2fab512 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 3c52e1944d8f..3c52e1944d8f 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 07e76ea7f62a..07e76ea7f62a 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 9860c2b34bd4..9860c2b34bd4 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 20d85405bbac..20d85405bbac 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 816f32aba3c3..816f32aba3c3 100644
--- a/pkgs/tools/archivers/zip/natspec-gentoo.patch.bz2
+++ b/nixpkgs/pkgs/tools/archivers/zip/natspec-gentoo.patch.bz2
Binary files differdiff --git a/pkgs/tools/archivers/zpaq/default.nix b/nixpkgs/pkgs/tools/archivers/zpaq/default.nix
index c99221b36ba1..c99221b36ba1 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 84daee900cec..84daee900cec 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 611654331c3b..611654331c3b 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 ef83c58e4600..ef83c58e4600 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 584a2dc46f74..584a2dc46f74 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 e9727e101a06..e9727e101a06 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 502859cd52d3..502859cd52d3 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 4c28c4f3458f..4c28c4f3458f 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 f3eacae26f77..f3eacae26f77 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 825e1a0cc072..825e1a0cc072 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 38902f234a2b..38902f234a2b 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/copyartifacts-plugin.nix b/nixpkgs/pkgs/tools/audio/beets/copyartifacts-plugin.nix
index 3c9cc5639a8f..3c9cc5639a8f 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 21e748cc79de..21e748cc79de 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 1ea195a678e8..1ea195a678e8 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 538f9e933039..538f9e933039 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/darkice/default.nix b/nixpkgs/pkgs/tools/audio/darkice/default.nix
index 3cfb9a05b2dc..3cfb9a05b2dc 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 9b8baf9701d3..9b8baf9701d3 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 169f419cd672..169f419cd672 100644
--- a/pkgs/tools/audio/dir2opus/default.nix
+++ b/nixpkgs/pkgs/tools/audio/dir2opus/default.nix
diff --git a/pkgs/tools/audio/ezstream/default.nix b/nixpkgs/pkgs/tools/audio/ezstream/default.nix
index 6524bedf9392..6524bedf9392 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 23a33122c9fb..23a33122c9fb 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 f7e96971ab19..f7e96971ab19 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 141ce044c431..141ce044c431 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 4a0c244f07f7..4a0c244f07f7 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 f69e60117ce3..f69e60117ce3 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 fb3d0e51341c..fb3d0e51341c 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 19f670793ba2..19f670793ba2 100644
--- a/pkgs/tools/audio/mp3cat/default.nix
+++ b/nixpkgs/pkgs/tools/audio/mp3cat/default.nix
diff --git a/pkgs/tools/audio/mpdas/default.nix b/nixpkgs/pkgs/tools/audio/mpdas/default.nix
index 08bd864792bb..08bd864792bb 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 e0814bc4ddab..e0814bc4ddab 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 39df4ddec9f7..39df4ddec9f7 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 5b5a0d9c0e0a..5b5a0d9c0e0a 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 025eb96b0652..025eb96b0652 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 4b72ed3bfd30..4b72ed3bfd30 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 51f5ba656168..51f5ba656168 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 262d3dd389eb..262d3dd389eb 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 d8f15a65b45b..d8f15a65b45b 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 239e4b3fcca3..239e4b3fcca3 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 c0f0aa1bf938..c0f0aa1bf938 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 d1b055f1d5f4..d1b055f1d5f4 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 cda89302abdd..cda89302abdd 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 9906fa449dda..9906fa449dda 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 051743b46e7a..051743b46e7a 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 d86a0b09c269..d86a0b09c269 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 a4dd7197be0f..a4dd7197be0f 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 4452aea280a6..4452aea280a6 100644
--- a/pkgs/tools/audio/video2midi/default.nix
+++ b/nixpkgs/pkgs/tools/audio/video2midi/default.nix
diff --git a/pkgs/tools/audio/volumeicon/default.nix b/nixpkgs/pkgs/tools/audio/volumeicon/default.nix
index ed9558762502..ed9558762502 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 472b4a6508f2..472b4a6508f2 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 44c14f2dc324..44c14f2dc324 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 02b37784eaa9..02b37784eaa9 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 ad0001f22e17..ad0001f22e17 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 2fd67765aaf3..2fd67765aaf3 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 beb3db5e78b3..beb3db5e78b3 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 89f577e93ad0..89f577e93ad0 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 dfa28203dbf2..dfa28203dbf2 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 bf10f556b6bb..bf10f556b6bb 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 8aa2d015205e..8aa2d015205e 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 3ab1eba5b6f0..3ab1eba5b6f0 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 196e15a01336..196e15a01336 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 4c8d1a28c27c..4c8d1a28c27c 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 05a436049263..05a436049263 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 0127e32fe93b..0127e32fe93b 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 3a5ffc30f8f2..3a5ffc30f8f2 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 684100968e88..684100968e88 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 d217864e93e6..d217864e93e6 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 5511b2e67163..5511b2e67163 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 c774711b874c..c774711b874c 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 b090da852638..b090da852638 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 b2820feb0190..b2820feb0190 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 b5e6df18a15b..b5e6df18a15b 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 191808abc637..191808abc637 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 d476b797f38e..d476b797f38e 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 ceb6feae3962..ceb6feae3962 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 224b8b12906e..224b8b12906e 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 e30b0af45a52..e30b0af45a52 100644
--- a/pkgs/tools/backup/grab-site/default.nix
+++ b/nixpkgs/pkgs/tools/backup/grab-site/default.nix
diff --git a/pkgs/tools/backup/httrack/default.nix b/nixpkgs/pkgs/tools/backup/httrack/default.nix
index 6d761354b6af..6d761354b6af 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 e29acc6f3c85..e29acc6f3c85 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 546339ca002a..546339ca002a 100644
--- a/pkgs/tools/backup/iceshelf/default.nix
+++ b/nixpkgs/pkgs/tools/backup/iceshelf/default.nix
diff --git a/pkgs/tools/backup/lvmsync/Gemfile b/nixpkgs/pkgs/tools/backup/lvmsync/Gemfile
index a87462e2b8a2..a87462e2b8a2 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 1fe903f15088..1fe903f15088 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 dc589316a585..dc589316a585 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 7f80e928660b..7f80e928660b 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 0b7b7469af1b..0b7b7469af1b 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 46f213a6ef4c..46f213a6ef4c 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 e87878551254..e87878551254 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 279652b0cd0b..279652b0cd0b 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 021f783e0fdd..021f783e0fdd 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 a2e962d7f855..a2e962d7f855 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 05150e131e36..05150e131e36 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 712d0af29a95..712d0af29a95 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 e37327c429d5..e37327c429d5 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 e0ac2c3f2328..e0ac2c3f2328 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 7dafc7765b7d..7dafc7765b7d 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 f3910893b7b2..f3910893b7b2 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 ce23c8a8124f..ce23c8a8124f 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 33e3c77db887..33e3c77db887 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 da44e389bdd5..da44e389bdd5 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 d9f889897aa2..d9f889897aa2 100644
--- a/pkgs/tools/backup/restic/rest-server.nix
+++ b/nixpkgs/pkgs/tools/backup/restic/rest-server.nix
diff --git a/pkgs/tools/backup/rsbep/default.nix b/nixpkgs/pkgs/tools/backup/rsbep/default.nix
index 96bbea4791e8..96bbea4791e8 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 6abd7002f8d7..6abd7002f8d7 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 1bd8ebfd44b6..1bd8ebfd44b6 100644
--- a/pkgs/tools/backup/s3ql/default.nix
+++ b/nixpkgs/pkgs/tools/backup/s3ql/default.nix
diff --git a/pkgs/tools/backup/store-backup/default.nix b/nixpkgs/pkgs/tools/backup/store-backup/default.nix
index 7324f75d95fa..7324f75d95fa 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 3767a377cfcf..3767a377cfcf 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 b02ce82291aa..b02ce82291aa 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 19c7f9f172e2..19c7f9f172e2 100644
--- a/pkgs/tools/backup/tarsnapper/remove-argparse.patch
+++ b/nixpkgs/pkgs/tools/backup/tarsnapper/remove-argparse.patch
diff --git a/pkgs/tools/backup/ugarit-manifest-maker/default.nix b/nixpkgs/pkgs/tools/backup/ugarit-manifest-maker/default.nix
index 8f93474f8f16..8f93474f8f16 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 889d698188e2..889d698188e2 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 e8f0ea22df10..e8f0ea22df10 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 fe958cb55cc6..fe958cb55cc6 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 3b66ac1b491f..3b66ac1b491f 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 ce9237a7c6bc..ce9237a7c6bc 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 c9fb1c547260..c9fb1c547260 100644
--- a/pkgs/tools/backup/zbackup/default.nix
+++ b/nixpkgs/pkgs/tools/backup/zbackup/default.nix
diff --git a/pkgs/tools/backup/znapzend/default.nix b/nixpkgs/pkgs/tools/backup/znapzend/default.nix
index 05792ecbb128..05792ecbb128 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 84a2375302f7..84a2375302f7 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 f13db4572e08..f13db4572e08 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 47aaadc9ccf0..47aaadc9ccf0 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 5c8f65ae5141..5c8f65ae5141 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 b5fde8db589c..b5fde8db589c 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 0771505b7269..0771505b7269 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 94c011152da6..94c011152da6 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 12b021d5d3b3..12b021d5d3b3 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 e3a360818e63..e3a360818e63 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 13c4c88f95f0..13c4c88f95f0 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 0cdcd4c58df4..0cdcd4c58df4 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 63a429e50de8..63a429e50de8 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 aa47edcb96c4..aa47edcb96c4 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 402073ff5241..402073ff5241 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 028ac12c4a03..028ac12c4a03 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 8112b0971f3d..8112b0971f3d 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 c7aab91adbeb..c7aab91adbeb 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 a65f2d47d8f8..a65f2d47d8f8 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 888711a85014..888711a85014 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 5ed389c46ca2..5ed389c46ca2 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 cb265eae05bf..cb265eae05bf 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 6d58eb6e9a56..6d58eb6e9a56 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 a17b03025032..a17b03025032 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 45f910b03e66..45f910b03e66 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 81bd4f60f43e..81bd4f60f43e 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 c071e182d7f5..c071e182d7f5 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/cue2pops/default.nix b/nixpkgs/pkgs/tools/cd-dvd/cue2pops/default.nix
index 6523c8a0cf3f..6523c8a0cf3f 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 e4e34aa919b6..e4e34aa919b6 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 40ca08c92606..40ca08c92606 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+rw-tools/dvd+rw-tools-7.0-dvddl.patch b/nixpkgs/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-dvddl.patch
index c1c6fb3332a2..c1c6fb3332a2 100644
--- a/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-dvddl.patch
+++ b/nixpkgs/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-dvddl.patch
diff --git a/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-glibc2.6.90.patch b/nixpkgs/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-glibc2.6.90.patch
index 49742d3c4db0..49742d3c4db0 100644
--- a/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-glibc2.6.90.patch
+++ b/nixpkgs/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-glibc2.6.90.patch
diff --git a/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-wctomb.patch b/nixpkgs/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-wctomb.patch
index 3d13fc8d273e..3d13fc8d273e 100644
--- a/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-wctomb.patch
+++ b/nixpkgs/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-wctomb.patch
diff --git a/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-wexit.patch b/nixpkgs/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-wexit.patch
index e7910cbdd7b8..e7910cbdd7b8 100644
--- a/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-wexit.patch
+++ b/nixpkgs/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-wexit.patch
diff --git a/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.1-layerbreaksetup.patch b/nixpkgs/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.1-layerbreaksetup.patch
index 7636f8393df2..7636f8393df2 100644
--- a/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.1-layerbreaksetup.patch
+++ b/nixpkgs/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.1-layerbreaksetup.patch
diff --git a/pkgs/tools/cd-dvd/dvd-vr/default.nix b/nixpkgs/pkgs/tools/cd-dvd/dvd-vr/default.nix
index 99908f06b101..99908f06b101 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 82f1842e963e..82f1842e963e 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 ce3f3de2bc03..ce3f3de2bc03 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 21e35889382d..21e35889382d 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 ec814d97bde0..ec814d97bde0 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/lsdvd/default.nix b/nixpkgs/pkgs/tools/cd-dvd/lsdvd/default.nix
index 56ec8e19f54e..56ec8e19f54e 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 f33ba31beee8..f33ba31beee8 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 0a9d61e9da8e..0a9d61e9da8e 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 98853d1ba61a..98853d1ba61a 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/uif2iso/default.nix b/nixpkgs/pkgs/tools/cd-dvd/uif2iso/default.nix
index 4e3a2daafe81..4e3a2daafe81 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 502937dd565b..502937dd565b 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 f181ab71edfb..f181ab71edfb 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 fe7a1a044149..fe7a1a044149 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 1469a68bf0e6..1469a68bf0e6 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 db1e1dbfd857..db1e1dbfd857 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 a3987085c8e3..a3987085c8e3 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 4c88e58e6c10..4c88e58e6c10 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 617d86e7f1e3..617d86e7f1e3 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 d070a8bb0f85..d070a8bb0f85 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 eff324b32503..eff324b32503 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 bf3d13a7a691..bf3d13a7a691 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 a0ec6c07055b..a0ec6c07055b 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 53b968c5134b..53b968c5134b 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 c9ec557ab1f4..c9ec557ab1f4 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 bd4d85e90e36..bd4d85e90e36 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 59a11e2d4d75..59a11e2d4d75 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 6fcff7b29280..6fcff7b29280 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 cf616a21e0aa..cf616a21e0aa 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 64a9ad7f6562..64a9ad7f6562 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 083a71f6a756..083a71f6a756 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 1b8345986374..1b8345986374 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 3f2497cd8d22..3f2497cd8d22 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 df7700d41cb8..df7700d41cb8 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 0bf155807980..0bf155807980 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 cdc155474a78..cdc155474a78 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 dfd91bf37d34..dfd91bf37d34 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 092ad7737dd1..092ad7737dd1 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 00eb5f265aaf..00eb5f265aaf 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 9b9de8d8302f..9b9de8d8302f 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 7a3f34aae469..7a3f34aae469 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 8e55d24fc985..8e55d24fc985 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 49aa4e65c768..49aa4e65c768 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 1d5cd85a62e6..1d5cd85a62e6 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 bbba21f2b34d..bbba21f2b34d 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 1fabedaf62d8..1fabedaf62d8 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 7eca80f8400c..7eca80f8400c 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 fac8f1fc147c..fac8f1fc147c 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 f9ca3aa18575..f9ca3aa18575 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 8773121e6461..8773121e6461 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 60023d028a9f..60023d028a9f 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 3421045fe4c6..3421045fe4c6 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 32de493ec77d..32de493ec77d 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 c870e501209b..c870e501209b 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 0ff349e96e80..0ff349e96e80 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 03db413181d7..03db413181d7 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 20748c31ab81..20748c31ab81 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 06c7e6439a9f..06c7e6439a9f 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 ff2589031b6b..ff2589031b6b 100644
--- a/pkgs/tools/compression/zstd/default.nix
+++ b/nixpkgs/pkgs/tools/compression/zstd/default.nix
diff --git a/pkgs/tools/compression/zsync/default.nix b/nixpkgs/pkgs/tools/compression/zsync/default.nix
index 89016b3ff40f..89016b3ff40f 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 2e34c9dd4857..2e34c9dd4857 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 1be33e1299d2..1be33e1299d2 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 74ba47ceee1a..74ba47ceee1a 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 3a29d272b15b..3a29d272b15b 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/archivemount/default.nix b/nixpkgs/pkgs/tools/filesystems/archivemount/default.nix
index 18bde25267d3..18bde25267d3 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 5fc614de4a7f..5fc614de4a7f 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 cd0f3ea23229..cd0f3ea23229 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 c6cf79785b73..c6cf79785b73 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 efd48fb87fe7..efd48fb87fe7 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 e5dd2df5299d..e5dd2df5299d 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 48926a3aade7..48926a3aade7 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 8ef46afc18f5..8ef46afc18f5 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 f12e8af84b88..f12e8af84b88 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 dd44f16c3fec..dd44f16c3fec 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 b5694535e946..b5694535e946 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 57dc51e41115..57dc51e41115 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 9c9dbede83f4..9c9dbede83f4 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 b74e7f324665..b74e7f324665 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 ebab6c5b16ba..ebab6c5b16ba 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 168542f57df8..168542f57df8 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 791d59b7ac27..791d59b7ac27 100644
--- a/pkgs/tools/filesystems/buttersink/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/buttersink/default.nix
diff --git a/pkgs/tools/filesystems/ceph/0001-kv-RocksDBStore-API-break-additional.patch b/nixpkgs/pkgs/tools/filesystems/ceph/0001-kv-RocksDBStore-API-break-additional.patch
index 0b6f1d30a4c9..0b6f1d30a4c9 100644
--- a/pkgs/tools/filesystems/ceph/0001-kv-RocksDBStore-API-break-additional.patch
+++ b/nixpkgs/pkgs/tools/filesystems/ceph/0001-kv-RocksDBStore-API-break-additional.patch
diff --git a/pkgs/tools/filesystems/ceph/0002-fix-absolute-include-path.patch b/nixpkgs/pkgs/tools/filesystems/ceph/0002-fix-absolute-include-path.patch
index 01aa194dddf2..01aa194dddf2 100644
--- a/pkgs/tools/filesystems/ceph/0002-fix-absolute-include-path.patch
+++ b/nixpkgs/pkgs/tools/filesystems/ceph/0002-fix-absolute-include-path.patch
diff --git a/pkgs/tools/filesystems/ceph/default.nix b/nixpkgs/pkgs/tools/filesystems/ceph/default.nix
index ef3e36ff6275..ef3e36ff6275 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/ceph/default.nix
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/nixpkgs/pkgs/tools/filesystems/ceph/generic.nix
index 6ecc65149c49..6ecc65149c49 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/nixpkgs/pkgs/tools/filesystems/ceph/generic.nix
diff --git a/pkgs/tools/filesystems/chunkfs/default.nix b/nixpkgs/pkgs/tools/filesystems/chunkfs/default.nix
index 47428e7f52e4..47428e7f52e4 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 4a8c767e44ac..4a8c767e44ac 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 8af745ed436e..8af745ed436e 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 46635aa67412..46635aa67412 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 71e27c94dbdb..71e27c94dbdb 100644
--- a/pkgs/tools/filesystems/cryfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix
diff --git a/pkgs/tools/filesystems/cryfs/skip-failing-test-large-malloc.patch b/nixpkgs/pkgs/tools/filesystems/cryfs/skip-failing-test-large-malloc.patch
index feb0ed9cfbb9..feb0ed9cfbb9 100644
--- a/pkgs/tools/filesystems/cryfs/skip-failing-test-large-malloc.patch
+++ b/nixpkgs/pkgs/tools/filesystems/cryfs/skip-failing-test-large-malloc.patch
diff --git a/pkgs/tools/filesystems/cryfs/test-no-network.patch b/nixpkgs/pkgs/tools/filesystems/cryfs/test-no-network.patch
index 3392d3f855ec..3392d3f855ec 100644
--- a/pkgs/tools/filesystems/cryfs/test-no-network.patch
+++ b/nixpkgs/pkgs/tools/filesystems/cryfs/test-no-network.patch
diff --git a/pkgs/tools/filesystems/curlftpfs/default.nix b/nixpkgs/pkgs/tools/filesystems/curlftpfs/default.nix
index 5636909093e6..5636909093e6 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 4952036a860b..4952036a860b 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/default.nix b/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix
index 512b5ce85677..512b5ce85677 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 f71248a28f4d..f71248a28f4d 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 ae69b4460f5a..ae69b4460f5a 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 2e4ea88df7f4..2e4ea88df7f4 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 b8028741d57f..b8028741d57f 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 e8deeaf4b470..e8deeaf4b470 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 82f64362fadf..82f64362fadf 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 e1b11a370553..e1b11a370553 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 208cbb83209c..208cbb83209c 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 babb3d844fe9..babb3d844fe9 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 dcaad81a5a3f..dcaad81a5a3f 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 1a9951a33fd7..1a9951a33fd7 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 97a96651a68e..97a96651a68e 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 0211ab63b3e9..0211ab63b3e9 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 e0c5ea3def4e..e0c5ea3def4e 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 90bb443dfdd2..90bb443dfdd2 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 1503732240c3..1503732240c3 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 598263c8895e..598263c8895e 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 7bb5dd415a6a..7bb5dd415a6a 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 e9aa87a2d564..e9aa87a2d564 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 18d9097dacbc..18d9097dacbc 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 9c9f58e97ab4..9c9f58e97ab4 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 8eeb052b22f0..8eeb052b22f0 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 75e5280d391d..75e5280d391d 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 82e2b404b82a..82e2b404b82a 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 dbdd0bf1790e..dbdd0bf1790e 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 8a417cfe397d..8a417cfe397d 100644
--- a/pkgs/tools/filesystems/fuseiso/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/fuseiso/default.nix
diff --git a/pkgs/tools/filesystems/fusesmb/default.nix b/nixpkgs/pkgs/tools/filesystems/fusesmb/default.nix
index ada9445218b9..ada9445218b9 100644
--- a/pkgs/tools/filesystems/fusesmb/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/fusesmb/default.nix
diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix
index ccc5f1f2d4a8..ccc5f1f2d4a8 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 0ef85abd2b77..0ef85abd2b77 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 581970e34fa7..581970e34fa7 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 6a3e280aae36..6a3e280aae36 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 ec734e52f733..ec734e52f733 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 e915cc1c132a..e915cc1c132a 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 f679fb8f4c1b..f679fb8f4c1b 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/glusterfs/glusterfs-glusterfind-log-remote-node_cmd-error.patch b/nixpkgs/pkgs/tools/filesystems/glusterfs/glusterfs-glusterfind-log-remote-node_cmd-error.patch
index 8bc00fdbf75c..8bc00fdbf75c 100644
--- a/pkgs/tools/filesystems/glusterfs/glusterfs-glusterfind-log-remote-node_cmd-error.patch
+++ b/nixpkgs/pkgs/tools/filesystems/glusterfs/glusterfs-glusterfind-log-remote-node_cmd-error.patch
diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-python-remove-find_library.patch b/nixpkgs/pkgs/tools/filesystems/glusterfs/glusterfs-python-remove-find_library.patch
index 4757f2fce771..4757f2fce771 100644
--- a/pkgs/tools/filesystems/glusterfs/glusterfs-python-remove-find_library.patch
+++ b/nixpkgs/pkgs/tools/filesystems/glusterfs/glusterfs-python-remove-find_library.patch
diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch b/nixpkgs/pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch
index acb15464e48f..acb15464e48f 100644
--- a/pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch
+++ b/nixpkgs/pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch
diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/nixpkgs/pkgs/tools/filesystems/go-mtpfs/default.nix
index 72e43725ef59..72e43725ef59 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 f558a53f7d2d..f558a53f7d2d 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 d923dba0bc0a..d923dba0bc0a 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 2589b41a0a5e..2589b41a0a5e 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 ca2d0a627ab8..ca2d0a627ab8 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 4f7c2248a8ed..4f7c2248a8ed 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 25ec31ea698a..25ec31ea698a 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 b0f7981ebb3c..b0f7981ebb3c 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 4594aa9370ca..4594aa9370ca 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 72ed4f0ee1b4..72ed4f0ee1b4 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 083bae24d601..083bae24d601 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 902d7d7d1a1e..902d7d7d1a1e 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 031c1440fcf9..031c1440fcf9 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 16b6ba08cbb2..16b6ba08cbb2 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 697029cd5a8c..697029cd5a8c 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 92dfe00c9514..92dfe00c9514 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 dd2a93a81ec6..dd2a93a81ec6 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 a682f2695f9e..a682f2695f9e 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 6044806a34b7..6044806a34b7 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 f6637b621b8e..f6637b621b8e 100644
--- a/pkgs/tools/filesystems/lizardfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/lizardfs/default.nix
diff --git a/pkgs/tools/filesystems/lizardfs/remove-download-external.patch b/nixpkgs/pkgs/tools/filesystems/lizardfs/remove-download-external.patch
index 6bbe95197772..6bbe95197772 100644
--- a/pkgs/tools/filesystems/lizardfs/remove-download-external.patch
+++ b/nixpkgs/pkgs/tools/filesystems/lizardfs/remove-download-external.patch
diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix
index 43c7c167b5ef..43c7c167b5ef 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 44337cf11619..44337cf11619 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 15bb390e3648..15bb390e3648 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 35e58cf0ce9e..35e58cf0ce9e 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 48f13925ab08..48f13925ab08 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 c0b74d9cf1b7..c0b74d9cf1b7 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 73227b3d9f03..73227b3d9f03 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 cc8ca8411248..cc8ca8411248 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 9b3094e60053..9b3094e60053 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 d0ceaf94a75f..d0ceaf94a75f 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 46b790afd30a..46b790afd30a 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 b477ad8deace..b477ad8deace 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 bf048113714f..bf048113714f 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 42889714e924..42889714e924 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 194c1f5fac9f..194c1f5fac9f 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 01c4ee9ba478..01c4ee9ba478 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 ea321200fb98..ea321200fb98 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 24aab7dc6dd4..24aab7dc6dd4 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 d53231a84fd6..d53231a84fd6 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 b5f3a2f3e1f6..b5f3a2f3e1f6 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 6a1c12e3e722..6a1c12e3e722 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 fd6088891023..fd6088891023 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 7c92dc95268e..7c92dc95268e 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 f30bd958cf3a..f30bd958cf3a 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 046fe81e64ac..046fe81e64ac 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 881301ed38e5..881301ed38e5 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 ce1d0bf28a16..ce1d0bf28a16 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 fd6c5b913093..fd6c5b913093 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 ce00367c771c..ce00367c771c 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 c919bfade3ac..c919bfade3ac 100644
--- a/pkgs/tools/filesystems/ntfs-3g/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/ntfs-3g/default.nix
diff --git a/pkgs/tools/filesystems/rdfind/default.nix b/nixpkgs/pkgs/tools/filesystems/rdfind/default.nix
index 2457ac59a213..2457ac59a213 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 967a8ee43bef..967a8ee43bef 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 345974bed58d..345974bed58d 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 356782a3d984..356782a3d984 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 04a15dfa22be..04a15dfa22be 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 cdc90097653f..cdc90097653f 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 033db7c18c29..033db7c18c29 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 816c09161dcf..816c09161dcf 100644
--- a/pkgs/tools/filesystems/s3fs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/s3fs/default.nix
diff --git a/pkgs/tools/filesystems/securefs/default.nix b/nixpkgs/pkgs/tools/filesystems/securefs/default.nix
index a21aacb7e6b8..a21aacb7e6b8 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 94c45ec4689a..94c45ec4689a 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 26cef4ac90f2..26cef4ac90f2 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 d56fa42f1d1b..d56fa42f1d1b 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 725ff3e56dcd..725ff3e56dcd 100644
--- a/pkgs/tools/filesystems/snapraid/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/snapraid/default.nix
diff --git a/pkgs/tools/filesystems/squashfs/0001-If-SOURCE_DATE_EPOCH-is-set-override-timestamps-with.patch b/nixpkgs/pkgs/tools/filesystems/squashfs/0001-If-SOURCE_DATE_EPOCH-is-set-override-timestamps-with.patch
index 5626800e723c..5626800e723c 100644
--- a/pkgs/tools/filesystems/squashfs/0001-If-SOURCE_DATE_EPOCH-is-set-override-timestamps-with.patch
+++ b/nixpkgs/pkgs/tools/filesystems/squashfs/0001-If-SOURCE_DATE_EPOCH-is-set-override-timestamps-with.patch
diff --git a/pkgs/tools/filesystems/squashfs/0002-If-SOURCE_DATE_EPOCH-is-set-also-clamp-content-times.patch b/nixpkgs/pkgs/tools/filesystems/squashfs/0002-If-SOURCE_DATE_EPOCH-is-set-also-clamp-content-times.patch
index 5002375887fb..5002375887fb 100644
--- a/pkgs/tools/filesystems/squashfs/0002-If-SOURCE_DATE_EPOCH-is-set-also-clamp-content-times.patch
+++ b/nixpkgs/pkgs/tools/filesystems/squashfs/0002-If-SOURCE_DATE_EPOCH-is-set-also-clamp-content-times.patch
diff --git a/pkgs/tools/filesystems/squashfs/0003-remove-frag-deflator-thread.patch b/nixpkgs/pkgs/tools/filesystems/squashfs/0003-remove-frag-deflator-thread.patch
index 4be4b96369a8..4be4b96369a8 100644
--- a/pkgs/tools/filesystems/squashfs/0003-remove-frag-deflator-thread.patch
+++ b/nixpkgs/pkgs/tools/filesystems/squashfs/0003-remove-frag-deflator-thread.patch
diff --git a/pkgs/tools/filesystems/squashfs/darwin.patch b/nixpkgs/pkgs/tools/filesystems/squashfs/darwin.patch
index 6022e65be479..6022e65be479 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 59a786116df6..59a786116df6 100644
--- a/pkgs/tools/filesystems/squashfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/squashfs/default.nix
diff --git a/pkgs/tools/filesystems/squashfs/squashfs-tools-4.4-4k-align.patch b/nixpkgs/pkgs/tools/filesystems/squashfs/squashfs-tools-4.4-4k-align.patch
index c9c3dd3d7604..c9c3dd3d7604 100644
--- a/pkgs/tools/filesystems/squashfs/squashfs-tools-4.4-4k-align.patch
+++ b/nixpkgs/pkgs/tools/filesystems/squashfs/squashfs-tools-4.4-4k-align.patch
diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix
index d7d917d5e9fb..d7d917d5e9fb 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 73b7f51fd364..73b7f51fd364 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 ebfb211732e8..ebfb211732e8 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 fd557a7ff565..fd557a7ff565 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 65eafe76710d..65eafe76710d 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 f17f9e0d2de5..f17f9e0d2de5 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 cfe3ff421fe4..cfe3ff421fe4 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 0a98b83282b6..0a98b83282b6 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 6cc049a44092..6cc049a44092 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 135373e09f42..135373e09f42 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 98cc327bc29c..98cc327bc29c 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 4c0c2343dd2a..4c0c2343dd2a 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 3b9e4a021080..3b9e4a021080 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 c311ac1af231..c311ac1af231 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 518e92814a41..518e92814a41 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 0e182d3bd2ea..0e182d3bd2ea 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 72f1a4188075..72f1a4188075 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 679704197c65..679704197c65 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 28067455c33e..28067455c33e 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 1d77bfe42500..1d77bfe42500 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 e86d81ba4435..e86d81ba4435 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 de09c2b27804..de09c2b27804 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 ad72933cc771..ad72933cc771 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 5bb209984396..5bb209984396 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 57a6c8c9673c..57a6c8c9673c 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 c65d1302dcaf..c65d1302dcaf 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 179f0432dd10..179f0432dd10 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 0e2018b6bfdd..0e2018b6bfdd 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 12fc6934531a..12fc6934531a 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 9fcb7ba404d0..9fcb7ba404d0 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 4fb85a2a1e89..4fb85a2a1e89 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 e4ceff36f92a..e4ceff36f92a 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 a12e5dbb8bb3..a12e5dbb8bb3 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 c8c330d80e5b..c8c330d80e5b 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 bb816e489404..bb816e489404 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 2bb7fe31bf7c..2bb7fe31bf7c 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 33e948663372..33e948663372 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 cb83e02689cf..cb83e02689cf 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 2ffe4eb7f809..2ffe4eb7f809 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 ad8d9ebc6a22..ad8d9ebc6a22 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 9735adca53dc..9735adca53dc 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 398ce08c5182..398ce08c5182 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 2a4f3c9cbff7..2a4f3c9cbff7 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 83fec1287a6b..83fec1287a6b 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 9ce95154cb0b..9ce95154cb0b 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 02a3a70fe516..02a3a70fe516 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 5d42482b3091..5d42482b3091 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 a089d5a95061..a089d5a95061 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 cfff76d141fb..cfff76d141fb 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 c7fab1710672..c7fab1710672 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 8f94624febe8..8f94624febe8 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 2bce8ec4941b..2bce8ec4941b 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 7303f27fe111..7303f27fe111 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 e619a889219c..e619a889219c 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 0ed1855a338c..0ed1855a338c 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 7d2323c6d480..7d2323c6d480 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 7719406cb6bf..7719406cb6bf 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 52f5a0997274..52f5a0997274 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 1331e38aef7e..1331e38aef7e 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 1f8a98e0296b..1f8a98e0296b 100644
--- a/pkgs/tools/graphics/glxinfo/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/glxinfo/default.nix
diff --git a/pkgs/tools/graphics/gmic/default.nix b/nixpkgs/pkgs/tools/graphics/gmic/default.nix
index 51212a3ea946..51212a3ea946 100644
--- a/pkgs/tools/graphics/gmic/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/gmic/default.nix
diff --git a/pkgs/tools/graphics/gmic_krita_qt/default.nix b/nixpkgs/pkgs/tools/graphics/gmic_krita_qt/default.nix
index 7ea73ab8db8d..7ea73ab8db8d 100644
--- a/pkgs/tools/graphics/gmic_krita_qt/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/gmic_krita_qt/default.nix
diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/nixpkgs/pkgs/tools/graphics/gnuplot/default.nix
index 7e823711e331..7e823711e331 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 92ad2e97b5b4..92ad2e97b5b4 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 009a86094ec5..009a86094ec5 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 544949f33b71..544949f33b71 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 db21df9b5d0d..db21df9b5d0d 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 48b1b0764c51..48b1b0764c51 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 667a5b38d3ed..667a5b38d3ed 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 1d3a8b26aae8..1d3a8b26aae8 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 db218a812e69..db218a812e69 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 11fad25b85ae..11fad25b85ae 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 b16dbe219853..b16dbe219853 100644
--- a/pkgs/tools/graphics/icoutils/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/icoutils/default.nix
diff --git a/pkgs/tools/graphics/imgur-screenshot/default.nix b/nixpkgs/pkgs/tools/graphics/imgur-screenshot/default.nix
index 8db5b6c7dea7..8db5b6c7dea7 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 883453379c4e..883453379c4e 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 13e18fd04476..13e18fd04476 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 1be5f0120fd9..1be5f0120fd9 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 e4405455097d..e4405455097d 100644
--- a/pkgs/tools/graphics/jhead/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/jhead/default.nix
diff --git a/pkgs/tools/graphics/kst/default.nix b/nixpkgs/pkgs/tools/graphics/kst/default.nix
index 24d678e11422..24d678e11422 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 d1b31f391526..d1b31f391526 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 fec092db0c52..fec092db0c52 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 a3cefddeb413..a3cefddeb413 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 42ccc4d5022e..42ccc4d5022e 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 4dcb5b0448dd..4dcb5b0448dd 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 a88471e143fd..a88471e143fd 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 ffba2280e8a5..ffba2280e8a5 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 360a233e139f..360a233e139f 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 666cdae131e2..666cdae131e2 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 534cefe9bf6c..534cefe9bf6c 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 99421cfde170..99421cfde170 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 07a4d6dedc04..07a4d6dedc04 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 c5651d0418e4..c5651d0418e4 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 a7f329caf74f..a7f329caf74f 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/qttools-bins.patch b/nixpkgs/pkgs/tools/graphics/nifskope/qttools-bins.patch
index 5d85f9ef4fdd..5d85f9ef4fdd 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 ac4d8441bf59..ac4d8441bf59 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 bc1419070757..bc1419070757 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 bc849b21117f..bc849b21117f 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 853d30b8e352..853d30b8e352 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 058900b8e237..058900b8e237 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 8733b2c1caa0..8733b2c1caa0 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 28b13c782b91..28b13c782b91 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 8428480ca037..8428480ca037 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 d394a816a49d..d394a816a49d 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 77edcd345780..77edcd345780 100644
--- a/pkgs/tools/graphics/pfstools/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/pfstools/default.nix
diff --git a/pkgs/tools/graphics/pfstools/pfstools.patch b/nixpkgs/pkgs/tools/graphics/pfstools/pfstools.patch
index c678a25b01bd..c678a25b01bd 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 e3f61db60899..e3f61db60899 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 c91c18e3f0b6..c91c18e3f0b6 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 2fb16b259bdc..2fb16b259bdc 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 d0e678578723..d0e678578723 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 04edbc709d0a..04edbc709d0a 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 d7c60a11eb67..d7c60a11eb67 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 c28d96fdd5bc..c28d96fdd5bc 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 61e21b1a33da..61e21b1a33da 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 6814a06e3b95..6814a06e3b95 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 fce1f3f913cf..fce1f3f913cf 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 e01f3ea2acc5..e01f3ea2acc5 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 9d0e1b0ea879..9d0e1b0ea879 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 4e7d1e361f91..4e7d1e361f91 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 e4163cd93a87..e4163cd93a87 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 dc9d9630ae5a..dc9d9630ae5a 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 2a467854cf0f..2a467854cf0f 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 64fe805d5015..64fe805d5015 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 44444e6148ab..44444e6148ab 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 9891ea5e52b0..9891ea5e52b0 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 c27eacaec8a2..c27eacaec8a2 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 fd538eec573d..fd538eec573d 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 5dbbd20cd827..5dbbd20cd827 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 035e135a2e40..035e135a2e40 100644
--- a/pkgs/tools/graphics/scrot/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/scrot/default.nix
diff --git a/pkgs/tools/graphics/sng/default.nix b/nixpkgs/pkgs/tools/graphics/sng/default.nix
index 182ab5806d7b..182ab5806d7b 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 c1e6c2afecce..c1e6c2afecce 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 8726e89c8308..8726e89c8308 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 ecf982c21cda..ecf982c21cda 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 6e455caf9066..6e455caf9066 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 1c3c0f3b4515..1c3c0f3b4515 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 0862293830d5..0862293830d5 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 ceee3b7674d9..ceee3b7674d9 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 9c1895b15196..9c1895b15196 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 87f01f70d302..87f01f70d302 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 5bd05c97be8e..5bd05c97be8e 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 3f330c164e7e..3f330c164e7e 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 4639658dccd8..4639658dccd8 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 3769860d469b..3769860d469b 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 b58114a61a5d..b58114a61a5d 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 f5311d378d7e..f5311d378d7e 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 5de5b7e5be57..5de5b7e5be57 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 320b4eed14c3..320b4eed14c3 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 5537540382bf..5537540382bf 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 56fd53502444..56fd53502444 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 00aeed6363e3..00aeed6363e3 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 20d07e52f6c7..20d07e52f6c7 100644
--- a/pkgs/tools/graphics/wavefunctioncollapse/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/wavefunctioncollapse/default.nix
diff --git a/pkgs/tools/graphics/welkin/default.nix b/nixpkgs/pkgs/tools/graphics/welkin/default.nix
index 2882ae960de1..2882ae960de1 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 237c9bb398b1..237c9bb398b1 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 749631999e49..749631999e49 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 1e3da5dddecf..1e3da5dddecf 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 7321128a6b5a..7321128a6b5a 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 8fbc09a6d82b..8fbc09a6d82b 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 503461018abb..503461018abb 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 3efb68e60d2b..3efb68e60d2b 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 bee3ac9e27a6..bee3ac9e27a6 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 a17ba49cecf0..a17ba49cecf0 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 cb2a25dc03f7..cb2a25dc03f7 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 ca6ac60bab69..ca6ac60bab69 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 9214edfefb05..9214edfefb05 100644
--- a/pkgs/tools/inputmethods/anthy/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/anthy/default.nix
diff --git a/nixpkgs/pkgs/tools/inputmethods/evscript/default.nix b/nixpkgs/pkgs/tools/inputmethods/evscript/default.nix
new file mode 100644
index 000000000000..48ca5c0ac0f0
--- /dev/null
+++ b/nixpkgs/pkgs/tools/inputmethods/evscript/default.nix
@@ -0,0 +1,23 @@
+{ rustPlatform, lib, fetchFromGitHub }:
+
+rustPlatform.buildRustPackage rec {
+  name = "evscript-unstable-${version}";
+  version = "2019-02-11";
+
+  src = fetchFromGitHub {
+    owner = "myfreeweb";
+    repo = "evscript";
+    rev = "de6e09b6858ea15893e29293e954b906a4e074d9";
+    sha256 = "04sal72shn4vi7x4qzip0rmn14lzbk6fczzf6glvdhjjlia743q7";
+  };
+
+  cargoSha256 = "127ds8b5zb0i5klgcdalh8ik8a25mm5rldr3267mjy548p9q216m";
+
+  meta = with lib; {
+    description = "Dyon scripting environment for evdev input devices";
+    homepage = https://github.com/myfreeweb/evscript;
+    license = licenses.unlicense;
+    maintainers = with maintainers; [ qyliss ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix
index a3f12d648d55..a3f12d648d55 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 e2d58c564989..e2d58c564989 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 f7bb7126bef0..f7bb7126bef0 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 32c9ecff9bd8..32c9ecff9bd8 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 84dd5fc8f462..84dd5fc8f462 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 4468f1fa263a..4468f1fa263a 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 292d2dbb57f5..292d2dbb57f5 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 d74c7608bc90..d74c7608bc90 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 2bd4bf1c878c..2bd4bf1c878c 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 c2e8837f5d13..c2e8837f5d13 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 918edf0240a5..918edf0240a5 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 929cdb30b919..929cdb30b919 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 ddfa41dda318..ddfa41dda318 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 69e4425d8c3b..69e4425d8c3b 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 e10ffae4a51e..e10ffae4a51e 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 166fd16811ab..166fd16811ab 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/unwrapped.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx/unwrapped.nix
index b32368c93d3c..b32368c93d3c 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 28a08e39b225..28a08e39b225 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 9aa2c3ac71a8..9aa2c3ac71a8 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 4038b50b44fe..4038b50b44fe 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 2630ab0fc81f..2630ab0fc81f 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 2edf9c0886f0..2edf9c0886f0 100644
--- a/pkgs/tools/inputmethods/fusuma/gemset.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/fusuma/gemset.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 77ec251ec881..77ec251ec881 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 daebceaf8876..daebceaf8876 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-kkc/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix
index 19d862e03085..19d862e03085 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 3bdb69391cc4..3bdb69391cc4 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 a0d50cf94790..a0d50cf94790 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 5699a7931dbc..5699a7931dbc 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 368de091777e..368de091777e 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 ff01c8419260..ff01c8419260 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 3f2ab1fc96a9..3f2ab1fc96a9 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 2b2cc1a34992..2b2cc1a34992 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 7b624b379a26..7b624b379a26 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 1115e4e232fc..1115e4e232fc 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/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
index e31d1ddfaa80..e31d1ddfaa80 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 d2090d776762..d2090d776762 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 192aa7d6395e..192aa7d6395e 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 8d02d4edde8e..8d02d4edde8e 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 3196c5b4e8ac..3196c5b4e8ac 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 994e9da3e430..994e9da3e430 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 a6aed47d964c..a6aed47d964c 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 469c96647d69..469c96647d69 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 bb179e18e078..bb179e18e078 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 4655879149d2..4655879149d2 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 407450c8bccd..407450c8bccd 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 75670dfe9dfb..75670dfe9dfb 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 33de43b6f5e5..33de43b6f5e5 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 8732d1a816d1..8732d1a816d1 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 baf57ed90498..baf57ed90498 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 a69f46e9678c..a69f46e9678c 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 b93c59d9789b..b93c59d9789b 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 cecacd4af954..cecacd4af954 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 8661da66b92a..8661da66b92a 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 55cf09455823..55cf09455823 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 82dd387f536d..82dd387f536d 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 ec8ac8845597..ec8ac8845597 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 be80962527ba..be80962527ba 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 984eecf9e9d5..984eecf9e9d5 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 60f3a0feb55b..60f3a0feb55b 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 ad129503de33..ad129503de33 100644
--- a/pkgs/tools/misc/0x0/default.nix
+++ b/nixpkgs/pkgs/tools/misc/0x0/default.nix
diff --git a/pkgs/tools/misc/abduco/default.nix b/nixpkgs/pkgs/tools/misc/abduco/default.nix
index 8545d86427a4..8545d86427a4 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 be47d42dc89f..be47d42dc89f 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 3c529f31f66e..3c529f31f66e 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 d0254e9ce9f5..d0254e9ce9f5 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 8ee363ed91dc..8ee363ed91dc 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 62d46bba5b0d..62d46bba5b0d 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 550ab4972d97..550ab4972d97 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 921c1af4ad6a..921c1af4ad6a 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 2dac9bd60c93..2dac9bd60c93 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 6b1512e854b0..6b1512e854b0 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 dc51d04e4b5e..dc51d04e4b5e 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 d42c666e9674..d42c666e9674 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 859112d29bc2..859112d29bc2 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 ca4dde7a450c..ca4dde7a450c 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 3fd520513570..3fd520513570 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 423fc9d85350..423fc9d85350 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 75c7b258a449..75c7b258a449 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 c7829239c41f..c7829239c41f 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 5ead0e1020cb..5ead0e1020cb 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 d07af99d5e59..d07af99d5e59 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 4f90c0f03e9a..4f90c0f03e9a 100644
--- a/pkgs/tools/misc/bandwidth/default.nix
+++ b/nixpkgs/pkgs/tools/misc/bandwidth/default.nix
diff --git a/pkgs/tools/misc/bashplotlib/default.nix b/nixpkgs/pkgs/tools/misc/bashplotlib/default.nix
index 79f72746f905..79f72746f905 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 205bc196811b..205bc196811b 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 ecff2459ef26..ecff2459ef26 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 ba8857abb581..ba8857abb581 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 111ab254accb..111ab254accb 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 1c681d4986d7..1c681d4986d7 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 8c310310d43f..8c310310d43f 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 a1e9f21c52cc..a1e9f21c52cc 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 4ec736418428..4ec736418428 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 89d684614314..89d684614314 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 5e8a8c56b0a7..5e8a8c56b0a7 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 d7cca2a77bdc..d7cca2a77bdc 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 2de6715db8fe..2de6715db8fe 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 a5581c84d504..a5581c84d504 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 4248dd6bd93c..4248dd6bd93c 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 8e3e08fb5e55..8e3e08fb5e55 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 d212f213a60e..d212f213a60e 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 7391c271cd17..7391c271cd17 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 fc10538bbbbd..fc10538bbbbd 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 f86d44c580de..f86d44c580de 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 2bde876c68c1..2bde876c68c1 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 fa7457b417e5..fa7457b417e5 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 2ba5499d7f77..2ba5499d7f77 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 8b1cf6318e38..8b1cf6318e38 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 90fc68dcc5cc..90fc68dcc5cc 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 65196e2a3b66..65196e2a3b66 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 8a269e3eb4b3..8a269e3eb4b3 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 a3b30423aa8f..a3b30423aa8f 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 ac2f3f3411a2..ac2f3f3411a2 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 409297de9f75..409297de9f75 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 00ab4cd75d0c..00ab4cd75d0c 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 6bf988d6117f..6bf988d6117f 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 4c54ab239d29..4c54ab239d29 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 f15dfc2adba7..f15dfc2adba7 100644
--- a/pkgs/tools/misc/chezmoi/default.nix
+++ b/nixpkgs/pkgs/tools/misc/chezmoi/default.nix
diff --git a/pkgs/tools/misc/chezmoi/deps.nix b/nixpkgs/pkgs/tools/misc/chezmoi/deps.nix
index 4fb1bd535528..4fb1bd535528 100644
--- a/pkgs/tools/misc/chezmoi/deps.nix
+++ b/nixpkgs/pkgs/tools/misc/chezmoi/deps.nix
diff --git a/pkgs/tools/misc/cht.sh/default.nix b/nixpkgs/pkgs/tools/misc/cht.sh/default.nix
index 837bc0e9ed71..837bc0e9ed71 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 fdb0f008a6cb..fdb0f008a6cb 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 5545292a65ee..5545292a65ee 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 f2156fc3b23b..f2156fc3b23b 100644
--- a/pkgs/tools/misc/ckb-next/modprobe.patch
+++ b/nixpkgs/pkgs/tools/misc/ckb-next/modprobe.patch
diff --git a/pkgs/tools/misc/ckb-next/systemd-service.patch b/nixpkgs/pkgs/tools/misc/ckb-next/systemd-service.patch
index 917bc09627f7..917bc09627f7 100644
--- a/pkgs/tools/misc/ckb-next/systemd-service.patch
+++ b/nixpkgs/pkgs/tools/misc/ckb-next/systemd-service.patch
diff --git a/pkgs/tools/misc/clac/default.nix b/nixpkgs/pkgs/tools/misc/clac/default.nix
index e4b3fab818b7..e4b3fab818b7 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 135eda554b36..135eda554b36 100644
--- a/pkgs/tools/misc/clasp/default.nix
+++ b/nixpkgs/pkgs/tools/misc/clasp/default.nix
diff --git a/pkgs/tools/misc/clex/default.nix b/nixpkgs/pkgs/tools/misc/clex/default.nix
index 54a6fac17a3c..54a6fac17a3c 100644
--- a/pkgs/tools/misc/clex/default.nix
+++ b/nixpkgs/pkgs/tools/misc/clex/default.nix
diff --git a/pkgs/tools/misc/clipnotify/default.nix b/nixpkgs/pkgs/tools/misc/clipnotify/default.nix
index 6bd0f8be2fa6..6bd0f8be2fa6 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 ed0239256cdf..ed0239256cdf 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 38041f0b32da..38041f0b32da 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 b9046bf19ca5..b9046bf19ca5 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 6898833b6f12..6898833b6f12 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 bda8ebcf3b0e..bda8ebcf3b0e 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 38b4916e3942..38b4916e3942 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 12821cf864c2..12821cf864c2 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 91fb208f5c05..91fb208f5c05 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 6d91cbbcb022..6d91cbbcb022 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 b262626b1363..b262626b1363 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 56b9d5c849a5..56b9d5c849a5 100644
--- a/pkgs/tools/misc/convmv/default.nix
+++ b/nixpkgs/pkgs/tools/misc/convmv/default.nix
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 2f69347ffabd..2f69347ffabd 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-musl-cross.patch b/nixpkgs/pkgs/tools/misc/coreutils/coreutils-8.31-musl-cross.patch
index 02b0b85db312..02b0b85db312 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 c80bb64d0bbd..c80bb64d0bbd 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 6b5c9c513944..6b5c9c513944 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 9a764c12941e..9a764c12941e 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 f35da52081bc..f35da52081bc 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 b4abb3097b98..b4abb3097b98 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 696fbe863832..696fbe863832 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 7ca103062c11..7ca103062c11 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 6bbf049d2445..6bbf049d2445 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 94f36adcf9b0..94f36adcf9b0 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 5a82c7660890..5a82c7660890 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 4ad5a10149ec..4ad5a10149ec 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 e12868207970..e12868207970 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 230a97da5e44..230a97da5e44 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 05a312bb8bca..05a312bb8bca 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 9107debfd12c..9107debfd12c 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 8dcaecf9851c..8dcaecf9851c 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 c602a4c9235e..c602a4c9235e 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 8453aa677477..8453aa677477 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 3a607b4ec751..3a607b4ec751 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 3ed284aa3e1f..3ed284aa3e1f 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 ddd0053f529a..ddd0053f529a 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 0a3ae5c28e97..0a3ae5c28e97 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 3e47ebd51d74..3e47ebd51d74 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 004d635cff0e..004d635cff0e 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 9ad891fd9bd8..9ad891fd9bd8 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 22da00da9fca..22da00da9fca 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 b0841ce0bb57..b0841ce0bb57 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 5f4d118cfed7..5f4d118cfed7 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 61c8a8370d7f..61c8a8370d7f 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 e71971ccb091..e71971ccb091 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 7b97e58fdf96..7b97e58fdf96 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 ef00c753d3aa..ef00c753d3aa 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 22951eecf533..22951eecf533 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 df084579b79a..df084579b79a 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 affcd310bea0..affcd310bea0 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 f6bc091c14af..f6bc091c14af 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 2c8125a46165..2c8125a46165 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 ff7aa6b3f9fc..ff7aa6b3f9fc 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 e541fc0f0d4f..e541fc0f0d4f 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 739d11c7b5ab..739d11c7b5ab 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 979b3be04933..979b3be04933 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 6edcefb11d5e..6edcefb11d5e 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 88359adc3185..88359adc3185 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 c50e3adb6abb..c50e3adb6abb 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 07a1807e9a71..07a1807e9a71 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 f5091ac9720a..f5091ac9720a 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 892287fa2d70..892287fa2d70 100644
--- a/pkgs/tools/misc/dumptorrent/default.nix
+++ b/nixpkgs/pkgs/tools/misc/dumptorrent/default.nix
diff --git a/pkgs/tools/misc/dust/default.nix b/nixpkgs/pkgs/tools/misc/dust/default.nix
index b9a66ba95d9f..b9a66ba95d9f 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 bedfebd96812..bedfebd96812 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 10fb4cd89bd9..10fb4cd89bd9 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 6ee2a465c69a..6ee2a465c69a 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 c88e29bb4553..c88e29bb4553 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 e2f2f51ccfb9..e2f2f51ccfb9 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 5eb4055d5b96..5eb4055d5b96 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 6f491ac93496..6f491ac93496 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 d4f69340d0ae..d4f69340d0ae 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 19bcd77923b9..19bcd77923b9 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 ea08608da01c..ea08608da01c 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 86f78af25603..86f78af25603 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 b9efead27988..b9efead27988 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 9d3b796c8796..9d3b796c8796 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 50ee066d96a2..50ee066d96a2 100644
--- a/pkgs/tools/misc/esptool/default.nix
+++ b/nixpkgs/pkgs/tools/misc/esptool/default.nix
diff --git a/pkgs/tools/misc/ethminer/default.nix b/nixpkgs/pkgs/tools/misc/ethminer/default.nix
index 8a270ed0fef6..8a270ed0fef6 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 963086b717a8..963086b717a8 100644
--- a/pkgs/tools/misc/ethtool/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ethtool/default.nix
diff --git a/pkgs/tools/misc/exa/default.nix b/nixpkgs/pkgs/tools/misc/exa/default.nix
index fe117492e82b..fe117492e82b 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 5a967ea20959..5a967ea20959 100644
--- a/pkgs/tools/misc/execline/default.nix
+++ b/nixpkgs/pkgs/tools/misc/execline/default.nix
diff --git a/pkgs/tools/misc/expect/default.nix b/nixpkgs/pkgs/tools/misc/expect/default.nix
index bb701f187fa8..bb701f187fa8 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 b651caf5a5e7..b651caf5a5e7 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 64bceb355a29..64bceb355a29 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 84b61f9aae92..84b61f9aae92 100644
--- a/pkgs/tools/misc/fdupes/default.nix
+++ b/nixpkgs/pkgs/tools/misc/fdupes/default.nix
diff --git a/pkgs/tools/misc/ffsend/default.nix b/nixpkgs/pkgs/tools/misc/ffsend/default.nix
index 22697cfb24d3..22697cfb24d3 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 86434847b4a2..86434847b4a2 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 14858428ee99..14858428ee99 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 e934da76e6e5..e934da76e6e5 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 6818bb708bb6..6818bb708bb6 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 73d307f9413d..73d307f9413d 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 9db66480cb10..9db66480cb10 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/nixpkgs/pkgs/tools/misc/findutils/default.nix
diff --git a/pkgs/tools/misc/findutils/disable-getdtablesize-test.patch b/nixpkgs/pkgs/tools/misc/findutils/disable-getdtablesize-test.patch
index 611df364b687..611df364b687 100644
--- a/pkgs/tools/misc/findutils/disable-getdtablesize-test.patch
+++ b/nixpkgs/pkgs/tools/misc/findutils/disable-getdtablesize-test.patch
diff --git a/pkgs/tools/misc/findutils/memory-leak.patch b/nixpkgs/pkgs/tools/misc/findutils/memory-leak.patch
index 56f65f856224..56f65f856224 100644
--- a/pkgs/tools/misc/findutils/memory-leak.patch
+++ b/nixpkgs/pkgs/tools/misc/findutils/memory-leak.patch
diff --git a/pkgs/tools/misc/findutils/no-install-statedir.patch b/nixpkgs/pkgs/tools/misc/findutils/no-install-statedir.patch
index a7a48038a3aa..a7a48038a3aa 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 16a46ac1432b..16a46ac1432b 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 a7ca7700c71b..a7ca7700c71b 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 a72279b90b6e..a72279b90b6e 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 6d24f3a44735..6d24f3a44735 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 952c419ad313..952c419ad313 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 3d852e367594..3d852e367594 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 c9ee511ff830..c9ee511ff830 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 022127238ecc..022127238ecc 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 e31da3bfd212..e31da3bfd212 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 e012d40271b5..e012d40271b5 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 fb53c619b2bc..fb53c619b2bc 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 ea4acfc5f0bb..ea4acfc5f0bb 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 45d27e7b7c82..45d27e7b7c82 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 f75dfec5e562..f75dfec5e562 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 6271eb599b58..6271eb599b58 100644
--- a/pkgs/tools/misc/fpp/default.nix
+++ b/nixpkgs/pkgs/tools/misc/fpp/default.nix
diff --git a/pkgs/tools/misc/fsmark/default.nix b/nixpkgs/pkgs/tools/misc/fsmark/default.nix
index 0e821ce7f1f5..0e821ce7f1f5 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 f9e40b6b7867..f9e40b6b7867 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 e723db260eb5..e723db260eb5 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 a5baf4de5b84..a5baf4de5b84 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 b04b436ff5b1..b04b436ff5b1 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/fzf/default.nix b/nixpkgs/pkgs/tools/misc/fzf/default.nix
index 66da4f53099a..66da4f53099a 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 6a04213e21ae..6a04213e21ae 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 011231692f3a..011231692f3a 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 c187b09624ad..c187b09624ad 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 cf577a30354c..cf577a30354c 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 9c437deca07c..9c437deca07c 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 6307d012debd..6307d012debd 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 df623d0c178f..df623d0c178f 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 b95c7179141d..b95c7179141d 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 62414a604756..62414a604756 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 709d30050910..709d30050910 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 5c8bacac162c..5c8bacac162c 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 b8b86e07abb0..b8b86e07abb0 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 0b5deccaa904..0b5deccaa904 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 afcf9cf4c781..afcf9cf4c781 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 be4de738c1c3..be4de738c1c3 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 9369c31fdeb5..9369c31fdeb5 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 0430f010e97a..0430f010e97a 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 d7c10220f4b7..d7c10220f4b7 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 9bdfa3923401..9bdfa3923401 100644
--- a/pkgs/tools/misc/gosu/deps.nix
+++ b/nixpkgs/pkgs/tools/misc/gosu/deps.nix
diff --git a/pkgs/tools/misc/gparted/default.nix b/nixpkgs/pkgs/tools/misc/gparted/default.nix
index 6834a555e4d5..6834a555e4d5 100644
--- a/pkgs/tools/misc/gparted/default.nix
+++ b/nixpkgs/pkgs/tools/misc/gparted/default.nix
diff --git a/pkgs/tools/misc/graylog/default.nix b/nixpkgs/pkgs/tools/misc/graylog/default.nix
index bdb919006fd0..bdb919006fd0 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 a8d571da7ebd..a8d571da7ebd 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 451828b0f47b..451828b0f47b 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 6c5bac11e738..6c5bac11e738 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 7b5510e2344b..7b5510e2344b 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 b81eab4cd678..b81eab4cd678 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 ec1c5897ed79..ec1c5897ed79 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 1453a8adaa00..1453a8adaa00 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 87e9814d8993..87e9814d8993 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 97cecdce373f..97cecdce373f 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 5ee8722b5eca..5ee8722b5eca 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 d3b138ad3577..d3b138ad3577 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 e9883149ab5d..e9883149ab5d 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 69115b7101c9..69115b7101c9 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 19d8afb18575..19d8afb18575 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 ac38be046188..ac38be046188 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 ca4e477adce7..ca4e477adce7 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 ec77f3965273..ec77f3965273 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 f7cdf5ca608b..f7cdf5ca608b 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 905b63bee0c4..905b63bee0c4 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 a66b32c789c2..a66b32c789c2 100644
--- a/pkgs/tools/misc/gti/default.nix
+++ b/nixpkgs/pkgs/tools/misc/gti/default.nix
diff --git a/pkgs/tools/misc/h5utils/default.nix b/nixpkgs/pkgs/tools/misc/h5utils/default.nix
index db18cae77b1f..db18cae77b1f 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 8657e34e1608..8657e34e1608 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 be5e1371cd45..be5e1371cd45 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 b773fc5d6804..b773fc5d6804 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 8b19cd038951..8b19cd038951 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 7b0dddc2ae47..7b0dddc2ae47 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 13b69dad971f..13b69dad971f 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 969da7a70e40..969da7a70e40 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 1e7239535d4d..1e7239535d4d 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 d67e0681f33f..d67e0681f33f 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 bd3bebc881ee..bd3bebc881ee 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 17b48ad8741a..17b48ad8741a 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 45649977e566..45649977e566 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 e6402322d35a..e6402322d35a 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 0fe72425d79c..0fe72425d79c 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 82801da322c6..82801da322c6 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 76795892e715..76795892e715 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 55542b4c7fc6..55542b4c7fc6 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 9e21ab5e38ff..9e21ab5e38ff 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 b080e23b265a..b080e23b265a 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 f6b0649e4046..f6b0649e4046 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 b4ee1f2f5c0d..b4ee1f2f5c0d 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 6bbe4888d1b8..6bbe4888d1b8 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 fb1d6a5584f9..fb1d6a5584f9 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 42ab916db3e3..42ab916db3e3 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 d35267fae27e..d35267fae27e 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 f51448276802..f51448276802 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 a0fcc6074dc0..a0fcc6074dc0 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 d9aaefb46d94..d9aaefb46d94 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 a7c369cc6804..a7c369cc6804 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 d24cac78fab6..d24cac78fab6 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 49881f1b0b49..49881f1b0b49 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 1d1991dcd929..1d1991dcd929 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 c9489e37e25c..c9489e37e25c 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 a66923b03f49..a66923b03f49 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 7035f2ecedff..7035f2ecedff 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 01e85cbd824d..01e85cbd824d 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 898ecd9df4a8..898ecd9df4a8 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 141fc968a2d4..141fc968a2d4 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 b948fac3d116..b948fac3d116 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 15af413a999d..15af413a999d 100644
--- a/pkgs/tools/misc/ideviceinstaller/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ideviceinstaller/default.nix
diff --git a/pkgs/tools/misc/idutils/default.nix b/nixpkgs/pkgs/tools/misc/idutils/default.nix
index 959be2a4eb12..959be2a4eb12 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 6f92ffa07b52..6f92ffa07b52 100644
--- a/pkgs/tools/misc/idutils/nix-mapping.patch
+++ b/nixpkgs/pkgs/tools/misc/idutils/nix-mapping.patch
diff --git a/pkgs/tools/misc/ifdtool/default.nix b/nixpkgs/pkgs/tools/misc/ifdtool/default.nix
index 7d15825c27e8..7d15825c27e8 100644
--- a/pkgs/tools/misc/ifdtool/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ifdtool/default.nix
diff --git a/pkgs/tools/misc/intelmetool/default.nix b/nixpkgs/pkgs/tools/misc/intelmetool/default.nix
index 66378e457a26..66378e457a26 100644
--- a/pkgs/tools/misc/intelmetool/default.nix
+++ b/nixpkgs/pkgs/tools/misc/intelmetool/default.nix
diff --git a/pkgs/tools/misc/ipad_charge/default.nix b/nixpkgs/pkgs/tools/misc/ipad_charge/default.nix
index caefcb835a3f..caefcb835a3f 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 a9cddcc5ff81..a9cddcc5ff81 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 a87d199d9bd4..a87d199d9bd4 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 6539bf477e54..6539bf477e54 100644
--- a/pkgs/tools/misc/ised/default.upstream
+++ b/nixpkgs/pkgs/tools/misc/ised/default.upstream
diff --git a/pkgs/tools/misc/jdiskreport/builder.sh b/nixpkgs/pkgs/tools/misc/jdiskreport/builder.sh
index f95dafedd32a..f95dafedd32a 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 08fbba873e5b..08fbba873e5b 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 8b3324ad66a5..8b3324ad66a5 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 7e6b6124024a..7e6b6124024a 100644
--- a/pkgs/tools/misc/journaldriver/default.nix
+++ b/nixpkgs/pkgs/tools/misc/journaldriver/default.nix
diff --git a/pkgs/tools/misc/kanshi/default.nix b/nixpkgs/pkgs/tools/misc/kanshi/default.nix
index dac3b0c2c32b..dac3b0c2c32b 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 822932dc5ac4..822932dc5ac4 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 5c2e410cd930..5c2e410cd930 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 a021064a5ff9..a021064a5ff9 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 208c04ff039b..208c04ff039b 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 b6b56e1df937..b6b56e1df937 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 d2fb32319bf7..d2fb32319bf7 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 0307cd86df88..0307cd86df88 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 be0ceda511c4..be0ceda511c4 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 b7963c3ed817..b7963c3ed817 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 ea8f781e4055..ea8f781e4055 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 d388467559a4..d388467559a4 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 e48d6354eb53..e48d6354eb53 100644
--- a/pkgs/tools/misc/lbdb/default.nix
+++ b/nixpkgs/pkgs/tools/misc/lbdb/default.nix
diff --git a/pkgs/tools/misc/ldapvi/default.nix b/nixpkgs/pkgs/tools/misc/ldapvi/default.nix
index 72c9cecf5406..72c9cecf5406 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 c6b544f9e0a1..c6b544f9e0a1 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 e98b085c78d5..e98b085c78d5 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 9bb46f113fd0..9bb46f113fd0 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 1bffcf53c827..1bffcf53c827 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 6b5e836b14da..6b5e836b14da 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 eb3b6aa11e6a..eb3b6aa11e6a 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 d0395ecbd7f0..d0395ecbd7f0 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 cb9e2cbf1e84..cb9e2cbf1e84 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 2c13927dfad8..2c13927dfad8 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 18177c0a7e30..18177c0a7e30 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 8c9db5b8a778..8c9db5b8a778 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 beb8890c5a28..beb8890c5a28 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 bb0f93ba3283..bb0f93ba3283 100644
--- a/pkgs/tools/misc/lice/default.nix
+++ b/nixpkgs/pkgs/tools/misc/lice/default.nix
diff --git a/pkgs/tools/misc/linuxquota/default.nix b/nixpkgs/pkgs/tools/misc/linuxquota/default.nix
index d489a5188f14..d489a5188f14 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 da7db422377d..da7db422377d 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 bc52598ff800..bc52598ff800 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 e851855834a4..e851855834a4 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/5.x.nix b/nixpkgs/pkgs/tools/misc/logstash/5.x.nix
index 7834bc96bef0..7834bc96bef0 100644
--- a/pkgs/tools/misc/logstash/5.x.nix
+++ b/nixpkgs/pkgs/tools/misc/logstash/5.x.nix
diff --git a/pkgs/tools/misc/logstash/6.x.nix b/nixpkgs/pkgs/tools/misc/logstash/6.x.nix
index be26aee03b98..be26aee03b98 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 aa768e532b80..aa768e532b80 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 dc33d2ece548..dc33d2ece548 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 ea1216e2405d..ea1216e2405d 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 fbb9b673dbcf..fbb9b673dbcf 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 5b9466426bd9..5b9466426bd9 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 cfd2467d922d..cfd2467d922d 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 ef7a3e3ada40..ef7a3e3ada40 100644
--- a/pkgs/tools/misc/loop/default.nix
+++ b/nixpkgs/pkgs/tools/misc/loop/default.nix
diff --git a/pkgs/tools/misc/lrzsz/default.nix b/nixpkgs/pkgs/tools/misc/lrzsz/default.nix
index 11351790becc..11351790becc 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 3b9fc5ae691d..3b9fc5ae691d 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 cb594391e2a1..cb594391e2a1 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 e23e12bcb307..e23e12bcb307 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 8d0728b7556e..8d0728b7556e 100644
--- a/pkgs/tools/misc/man-db/default.nix
+++ b/nixpkgs/pkgs/tools/misc/man-db/default.nix
diff --git a/pkgs/tools/misc/man/conf.patch b/nixpkgs/pkgs/tools/misc/man/conf.patch
index 43e8642fb34a..43e8642fb34a 100644
--- a/pkgs/tools/misc/man/conf.patch
+++ b/nixpkgs/pkgs/tools/misc/man/conf.patch
diff --git a/pkgs/tools/misc/man/default.nix b/nixpkgs/pkgs/tools/misc/man/default.nix
index 2f61a30714e2..2f61a30714e2 100644
--- a/pkgs/tools/misc/man/default.nix
+++ b/nixpkgs/pkgs/tools/misc/man/default.nix
diff --git a/pkgs/tools/misc/man/share.patch b/nixpkgs/pkgs/tools/misc/man/share.patch
index 837786e28eba..837786e28eba 100644
--- a/pkgs/tools/misc/man/share.patch
+++ b/nixpkgs/pkgs/tools/misc/man/share.patch
diff --git a/pkgs/tools/misc/mandoc/default.nix b/nixpkgs/pkgs/tools/misc/mandoc/default.nix
index 9ddd92188016..9ddd92188016 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 580226d165bb..580226d165bb 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 34b10a550f6b..34b10a550f6b 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 e2ff4868c9ea..e2ff4868c9ea 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 6cf8de2fea0e..6cf8de2fea0e 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 7f0cdac1dbfa..7f0cdac1dbfa 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 334daef44817..334daef44817 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 52c96fda1973..52c96fda1973 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 322ab473811f..322ab473811f 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 bf747a58266a..bf747a58266a 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 6796163418f5..6796163418f5 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 1c9ade807778..1c9ade807778 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 8a3842322f98..8a3842322f98 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 d224ad1dcc5d..d224ad1dcc5d 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 bbd78feaaf87..bbd78feaaf87 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 b1d1971c75c7..b1d1971c75c7 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 10135d66408b..10135d66408b 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 4f6c4bad97c7..4f6c4bad97c7 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 03f9354445b2..03f9354445b2 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 3c2ed1352257..3c2ed1352257 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 18535253d9f5..18535253d9f5 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 8e65d4d2a543..8e65d4d2a543 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 7b9549a80fea..7b9549a80fea 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 da1e8be7cf49..da1e8be7cf49 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 baf418ac9f04..baf418ac9f04 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 1d3a355dd950..1d3a355dd950 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 0721ad0af608..0721ad0af608 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 602c9c26c787..602c9c26c787 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 f03b536c6156..f03b536c6156 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 a728450d76e5..a728450d76e5 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 00cbc8b46295..00cbc8b46295 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 3471016db5b9..3471016db5b9 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 5be323a6f4bc..5be323a6f4bc 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 778671f0b54e..778671f0b54e 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 6ed9cf69384d..6ed9cf69384d 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 26fcea669c22..26fcea669c22 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 04271b610699..04271b610699 100644
--- a/pkgs/tools/misc/ms-sys/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ms-sys/default.nix
diff --git a/pkgs/tools/misc/mstflint/default.nix b/nixpkgs/pkgs/tools/misc/mstflint/default.nix
index f3cd1c6e5277..f3cd1c6e5277 100644
--- a/pkgs/tools/misc/mstflint/default.nix
+++ b/nixpkgs/pkgs/tools/misc/mstflint/default.nix
diff --git a/pkgs/tools/misc/multitail/default.nix b/nixpkgs/pkgs/tools/misc/multitail/default.nix
index 07561d390cd0..07561d390cd0 100644
--- a/pkgs/tools/misc/multitail/default.nix
+++ b/nixpkgs/pkgs/tools/misc/multitail/default.nix
diff --git a/pkgs/tools/misc/mysql2pgsql/default.nix b/nixpkgs/pkgs/tools/misc/mysql2pgsql/default.nix
index 83e6ee5b5ca4..83e6ee5b5ca4 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 9c483fe3b8f2..9c483fe3b8f2 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 57036acb58e8..57036acb58e8 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 2312ce236abd..2312ce236abd 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 bb7924515647..bb7924515647 100644
--- a/pkgs/tools/misc/ncdu/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ncdu/default.nix
diff --git a/pkgs/tools/misc/neofetch/default.nix b/nixpkgs/pkgs/tools/misc/neofetch/default.nix
index 18ae88547a09..18ae88547a09 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 e19eac1c51e5..e19eac1c51e5 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 3037262322f2..3037262322f2 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 77c84ab45118..77c84ab45118 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 43165b4f54bb..43165b4f54bb 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 93c0f5e346bf..93c0f5e346bf 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 26517361ae2d..26517361ae2d 100644
--- a/pkgs/tools/misc/ntfy/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ntfy/default.nix
diff --git a/pkgs/tools/misc/nvramtool/default.nix b/nixpkgs/pkgs/tools/misc/nvramtool/default.nix
index fdce7076661a..fdce7076661a 100644
--- a/pkgs/tools/misc/nvramtool/default.nix
+++ b/nixpkgs/pkgs/tools/misc/nvramtool/default.nix
diff --git a/pkgs/tools/misc/nyancat/default.nix b/nixpkgs/pkgs/tools/misc/nyancat/default.nix
index 47a91915c431..47a91915c431 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 6d508a48901a..6d508a48901a 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 9ffb89aca6b1..9ffb89aca6b1 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 3896ca77a166..3896ca77a166 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 160474f81523..160474f81523 100644
--- a/pkgs/tools/misc/odyssey/default.nix
+++ b/nixpkgs/pkgs/tools/misc/odyssey/default.nix
diff --git a/pkgs/tools/misc/opentimestamps-client/default.nix b/nixpkgs/pkgs/tools/misc/opentimestamps-client/default.nix
index 94984c57e49c..94984c57e49c 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 f6aea4a92ab9..f6aea4a92ab9 100644
--- a/pkgs/tools/misc/opentsdb/default.nix
+++ b/nixpkgs/pkgs/tools/misc/opentsdb/default.nix
diff --git a/pkgs/tools/misc/os-prober/default.nix b/nixpkgs/pkgs/tools/misc/os-prober/default.nix
index 59a60e356b80..59a60e356b80 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 9b45680ffca2..9b45680ffca2 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 67e0c2b21d83..67e0c2b21d83 100644
--- a/pkgs/tools/misc/osm2pgsql/default.nix
+++ b/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix
diff --git a/pkgs/tools/misc/ostree/default.nix b/nixpkgs/pkgs/tools/misc/ostree/default.nix
index 0054e38ed2da..0054e38ed2da 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 d3ef7e08357a..d3ef7e08357a 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 f26a924c0d83..f26a924c0d83 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 96e5e6a1d94e..96e5e6a1d94e 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 be96dd9d3d35..be96dd9d3d35 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 811e44a6ce8e..811e44a6ce8e 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 521bebf47a3b..521bebf47a3b 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 37cbea46c813..37cbea46c813 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 75a1ba35e129..75a1ba35e129 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 49611aa0c3f8..49611aa0c3f8 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 1e747961499c..1e747961499c 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 4934252bed95..4934252bed95 100644
--- a/pkgs/tools/misc/parted/default.nix
+++ b/nixpkgs/pkgs/tools/misc/parted/default.nix
diff --git a/pkgs/tools/misc/parted/gpt-unicode-test-fix.patch b/nixpkgs/pkgs/tools/misc/parted/gpt-unicode-test-fix.patch
index 3070a2e4666d..3070a2e4666d 100644
--- a/pkgs/tools/misc/parted/gpt-unicode-test-fix.patch
+++ b/nixpkgs/pkgs/tools/misc/parted/gpt-unicode-test-fix.patch
diff --git a/pkgs/tools/misc/partition-manager/default.nix b/nixpkgs/pkgs/tools/misc/partition-manager/default.nix
index 4599309b2384..4599309b2384 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 a5e45dc259b9..a5e45dc259b9 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 f67a8274443c..f67a8274443c 100644
--- a/pkgs/tools/misc/patdiff/default.nix
+++ b/nixpkgs/pkgs/tools/misc/patdiff/default.nix
diff --git a/pkgs/tools/misc/pazi/cargo-lock.patch b/nixpkgs/pkgs/tools/misc/pazi/cargo-lock.patch
index 4be7aa44c9c7..4be7aa44c9c7 100644
--- a/pkgs/tools/misc/pazi/cargo-lock.patch
+++ b/nixpkgs/pkgs/tools/misc/pazi/cargo-lock.patch
diff --git a/pkgs/tools/misc/pazi/default.nix b/nixpkgs/pkgs/tools/misc/pazi/default.nix
index 48c248ad2055..48c248ad2055 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 fe1d848ee502..fe1d848ee502 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 f94d2cc27379..f94d2cc27379 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 045c004fb6ac..045c004fb6ac 100644
--- a/pkgs/tools/misc/peruse/default.nix
+++ b/nixpkgs/pkgs/tools/misc/peruse/default.nix
diff --git a/pkgs/tools/misc/pg_top/default.nix b/nixpkgs/pkgs/tools/misc/pg_top/default.nix
index 4f4bd7e754c4..4f4bd7e754c4 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 5e0d0aa80892..5e0d0aa80892 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 0e42dd392d7f..0e42dd392d7f 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 c16106f4637b..c16106f4637b 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 74d24db574ff..74d24db574ff 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 45b0da6f8db0..45b0da6f8db0 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 c49695fd9ad9..c49695fd9ad9 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 abbd64cb62fd..abbd64cb62fd 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 fc6666f8f12b..fc6666f8f12b 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 15c5cbc0eb11..15c5cbc0eb11 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 ececef398501..ececef398501 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 c1db4f9d5978..c1db4f9d5978 100644
--- a/pkgs/tools/misc/pk2cmd/default.nix
+++ b/nixpkgs/pkgs/tools/misc/pk2cmd/default.nix
diff --git a/pkgs/tools/misc/plantuml/default.nix b/nixpkgs/pkgs/tools/misc/plantuml/default.nix
index 42d03c06b87b..42d03c06b87b 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 41913f966534..41913f966534 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 191f8980d832..191f8980d832 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 0bd61c0fcdf5..0bd61c0fcdf5 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 e366a03a7f42..e366a03a7f42 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 2c9ed7be039e..2c9ed7be039e 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 7acbbc210614..7acbbc210614 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 2a34224c1266..2a34224c1266 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 ac98df58784f..ac98df58784f 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 b29d0eafcc9e..b29d0eafcc9e 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 335bddd6730e..335bddd6730e 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 ea304d2aa895..ea304d2aa895 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 7df2b47497f0..7df2b47497f0 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 4e840957ce32..4e840957ce32 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 3642653944b3..3642653944b3 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 43b6b931860c..43b6b931860c 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 c9cf6a3157c1..c9cf6a3157c1 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 7294c61da8fa..7294c61da8fa 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 2aa26f9a0202..2aa26f9a0202 100644
--- a/pkgs/tools/misc/pws/gemset.nix
+++ b/nixpkgs/pkgs/tools/misc/pws/gemset.nix
diff --git a/pkgs/tools/misc/qjoypad/default.nix b/nixpkgs/pkgs/tools/misc/qjoypad/default.nix
index 4428bf1e625a..4428bf1e625a 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 ddd4ae5ce056..ddd4ae5ce056 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 6af33691a07d..6af33691a07d 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 11ac0fc14199..11ac0fc14199 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 e7d600d2a1f2..e7d600d2a1f2 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 484bb765c0db..484bb765c0db 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 8d648e293c5a..8d648e293c5a 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 cc842105d0ae..cc842105d0ae 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 a2087902c93b..a2087902c93b 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 b5e5d64dda68..b5e5d64dda68 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 32b8de5adb80..32b8de5adb80 100644
--- a/pkgs/tools/misc/renameutils/install-exec.patch
+++ b/nixpkgs/pkgs/tools/misc/renameutils/install-exec.patch
diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/nixpkgs/pkgs/tools/misc/riemann-c-client/default.nix
index 970cf28c26d7..970cf28c26d7 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 ac6abd42c895..ac6abd42c895 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 65057156ad10..65057156ad10 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 6a3e1f3deb10..6a3e1f3deb10 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 450fba80b726..450fba80b726 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 ee7b2623b1dd..ee7b2623b1dd 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 301cf78b5a9b..301cf78b5a9b 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 fb55b15bbd55..fb55b15bbd55 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 bd60e786036f..bd60e786036f 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 320edd83021f..320edd83021f 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 925bb199b279..925bb199b279 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 e24b1fce06ef..e24b1fce06ef 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 650ac9f660aa..650ac9f660aa 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 0680f360209c..0680f360209c 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 b82ad5b24b5c..b82ad5b24b5c 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 2ea93319935f..2ea93319935f 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 345f26852dcb..345f26852dcb 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 dcdc6dde2cad..dcdc6dde2cad 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 2d1db4eb64c7..2d1db4eb64c7 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 bd760adecf75..bd760adecf75 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 1b7afdfbe9df..1b7afdfbe9df 100644
--- a/pkgs/tools/misc/scfbuild/default.nix
+++ b/nixpkgs/pkgs/tools/misc/scfbuild/default.nix
diff --git a/pkgs/tools/misc/screen/default.nix b/nixpkgs/pkgs/tools/misc/screen/default.nix
index df1fcd89ac78..df1fcd89ac78 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 a9cd9d75de8e..a9cd9d75de8e 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 23dccc0273d1..23dccc0273d1 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 6a2ed3bcb911..6a2ed3bcb911 100644
--- a/pkgs/tools/misc/sdl-jstest/default.nix
+++ b/nixpkgs/pkgs/tools/misc/sdl-jstest/default.nix
diff --git a/pkgs/tools/misc/shallot/default.nix b/nixpkgs/pkgs/tools/misc/shallot/default.nix
index 6c757ca224a9..6c757ca224a9 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 b44cbf100e8a..b44cbf100e8a 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 89257c8ffc46..89257c8ffc46 100644
--- a/pkgs/tools/misc/shelldap/default.nix
+++ b/nixpkgs/pkgs/tools/misc/shelldap/default.nix
diff --git a/pkgs/tools/misc/sixpair/default.nix b/nixpkgs/pkgs/tools/misc/sixpair/default.nix
index 055fa9418a9a..055fa9418a9a 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 b66e791dd0e0..b66e791dd0e0 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 5072bfb69343..5072bfb69343 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 b45304a43c4b..b45304a43c4b 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 6f7c9d3506b2..6f7c9d3506b2 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 72363de7653e..72363de7653e 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 bc0e86f1b518..bc0e86f1b518 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 0e84f738e80e..0e84f738e80e 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 f5e1fd7b1b4d..f5e1fd7b1b4d 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 ac0b950a1da5..ac0b950a1da5 100644
--- a/pkgs/tools/misc/snapper/default.nix
+++ b/nixpkgs/pkgs/tools/misc/snapper/default.nix
diff --git a/pkgs/tools/misc/sonota/default.nix b/nixpkgs/pkgs/tools/misc/sonota/default.nix
index de9366d1d0ff..de9366d1d0ff 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 f9a802657762..f9a802657762 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/staruml/default.nix b/nixpkgs/pkgs/tools/misc/staruml/default.nix
index dcbee0e343ec..dcbee0e343ec 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 a4d322ae1841..a4d322ae1841 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 e5cc5ad4198f..e5cc5ad4198f 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 c96ac41fb268..c96ac41fb268 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 5502f2542f12..5502f2542f12 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 cbf849494b75..cbf849494b75 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 025833431176..025833431176 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 2cd3058f2330..2cd3058f2330 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 73e144d93aa1..73e144d93aa1 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 93c984337e6b..93c984337e6b 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 29813d30ba6b..29813d30ba6b 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 0aa9ef4e6da8..0aa9ef4e6da8 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 53e8471fb532..53e8471fb532 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 f3627e8d6e95..f3627e8d6e95 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 03926b955383..03926b955383 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 d22bf73732c5..d22bf73732c5 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 5726611b9af7..5726611b9af7 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 121eff450b59..121eff450b59 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 e4680640ae2b..e4680640ae2b 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 ce633ac4447a..ce633ac4447a 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 046ba3d536e0..046ba3d536e0 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 419c2ae49d31..419c2ae49d31 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 2215e4d4fee7..2215e4d4fee7 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 f363d62b6d68..f363d62b6d68 100644
--- a/pkgs/tools/misc/teamocil/gemset.nix
+++ b/nixpkgs/pkgs/tools/misc/teamocil/gemset.nix
diff --git a/pkgs/tools/misc/teamocil/update b/nixpkgs/pkgs/tools/misc/teamocil/update
index 58a7bd4a4539..58a7bd4a4539 100755
--- a/pkgs/tools/misc/teamocil/update
+++ b/nixpkgs/pkgs/tools/misc/teamocil/update
diff --git a/pkgs/tools/misc/teleconsole/default.nix b/nixpkgs/pkgs/tools/misc/teleconsole/default.nix
index 2d3eb91250a8..2d3eb91250a8 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 f13529d4b25a..f13529d4b25a 100644
--- a/pkgs/tools/misc/teleconsole/deps.nix
+++ b/nixpkgs/pkgs/tools/misc/teleconsole/deps.nix
diff --git a/pkgs/tools/misc/termplay/default.nix b/nixpkgs/pkgs/tools/misc/termplay/default.nix
index 4f6a71135aa8..4f6a71135aa8 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 eb46f12c5c2c..eb46f12c5c2c 100644
--- a/pkgs/tools/misc/termtosvg/default.nix
+++ b/nixpkgs/pkgs/tools/misc/termtosvg/default.nix
diff --git a/pkgs/tools/misc/testdisk/default.nix b/nixpkgs/pkgs/tools/misc/testdisk/default.nix
index 14c152236d6b..14c152236d6b 100644
--- a/pkgs/tools/misc/testdisk/default.nix
+++ b/nixpkgs/pkgs/tools/misc/testdisk/default.nix
diff --git a/pkgs/tools/misc/tewisay/default.nix b/nixpkgs/pkgs/tools/misc/tewisay/default.nix
index 2d713ae3821c..2d713ae3821c 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 b6b1356dcf80..b6b1356dcf80 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 47216838476a..47216838476a 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 748a4e0ce6a5..748a4e0ce6a5 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 9b587c271546..9b587c271546 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 8f297542a3ca..8f297542a3ca 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 318ad6e3a9dc..318ad6e3a9dc 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 fa07eb43eee6..fa07eb43eee6 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 ed26895fba6f..ed26895fba6f 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 fcd556c55966..fcd556c55966 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 6e431fdc98ea..6e431fdc98ea 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 f5e1d69a0391..f5e1d69a0391 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 760f56726fab..760f56726fab 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 f54cd2756eb1..f54cd2756eb1 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/default.nix b/nixpkgs/pkgs/tools/misc/tmux/default.nix
index 36127dd57e64..36127dd57e64 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 ab2edf7be4e8..ab2edf7be4e8 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 b794e46b2585..b794e46b2585 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 968ead6131be..968ead6131be 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 2729f6f88594..2729f6f88594 100644
--- a/pkgs/tools/misc/toilet/default.nix
+++ b/nixpkgs/pkgs/tools/misc/toilet/default.nix
diff --git a/pkgs/tools/misc/toybox/default.nix b/nixpkgs/pkgs/tools/misc/toybox/default.nix
index 4591c5ac5b5a..4591c5ac5b5a 100644
--- a/pkgs/tools/misc/toybox/default.nix
+++ b/nixpkgs/pkgs/tools/misc/toybox/default.nix
diff --git a/pkgs/tools/misc/trash-cli/default.nix b/nixpkgs/pkgs/tools/misc/trash-cli/default.nix
index 1f5a6c4ea4c2..1f5a6c4ea4c2 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 d7b485eec158..d7b485eec158 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 7142d346336a..7142d346336a 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 84854606131f..84854606131f 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 eed527da4168..eed527da4168 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 e1da347c64f1..e1da347c64f1 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 4a2ab0d3475c..4a2ab0d3475c 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 5663bcc35fdb..5663bcc35fdb 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 113359a8bcea..113359a8bcea 100644
--- a/pkgs/tools/misc/tty-clock/default.nix
+++ b/nixpkgs/pkgs/tools/misc/tty-clock/default.nix
diff --git a/pkgs/tools/misc/ttylog/default.nix b/nixpkgs/pkgs/tools/misc/ttylog/default.nix
index fda9dc506e2f..fda9dc506e2f 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 78aeab00a50f..78aeab00a50f 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 126ab44090eb..126ab44090eb 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 ca6651718117..ca6651718117 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 316dc8e09c1e..316dc8e09c1e 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 f37892a231a5..f37892a231a5 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 90a9e0fa66ff..90a9e0fa66ff 100644
--- a/pkgs/tools/misc/txtw/default.nix
+++ b/nixpkgs/pkgs/tools/misc/txtw/default.nix
diff --git a/pkgs/tools/misc/ultrastar-creator/default.nix b/nixpkgs/pkgs/tools/misc/ultrastar-creator/default.nix
index 195a31b63e5b..195a31b63e5b 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 3ab404d02077..3ab404d02077 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 9ac60ca8b13a..9ac60ca8b13a 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 8e2342f4269e..8e2342f4269e 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 978a3d541ab0..978a3d541ab0 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 9ace1f137b82..9ace1f137b82 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 374e1b9eaf63..374e1b9eaf63 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 01b62eed56c3..01b62eed56c3 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 7751e03df193..7751e03df193 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 8a729857b819..8a729857b819 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 545d7c554acc..545d7c554acc 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 9b94d0037060..9b94d0037060 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 0fae40a5c964..0fae40a5c964 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 3e8b7d494deb..3e8b7d494deb 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 a93db7d7858d..a93db7d7858d 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 a32ce090ecdd..a32ce090ecdd 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 a39619f354bd..a39619f354bd 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 b3b1b4b310a7..b3b1b4b310a7 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 ac950894035b..ac950894035b 100644
--- a/pkgs/tools/misc/vdirsyncer/stable.nix
+++ b/nixpkgs/pkgs/tools/misc/vdirsyncer/stable.nix
diff --git a/pkgs/tools/misc/venus/default.nix b/nixpkgs/pkgs/tools/misc/venus/default.nix
index c51d3cc27027..c51d3cc27027 100644
--- a/pkgs/tools/misc/venus/default.nix
+++ b/nixpkgs/pkgs/tools/misc/venus/default.nix
diff --git a/pkgs/tools/misc/vfdecrypt/default.nix b/nixpkgs/pkgs/tools/misc/vfdecrypt/default.nix
index 83b91f6203ed..83b91f6203ed 100644
--- a/pkgs/tools/misc/vfdecrypt/default.nix
+++ b/nixpkgs/pkgs/tools/misc/vfdecrypt/default.nix
diff --git a/pkgs/tools/misc/vimer/default.nix b/nixpkgs/pkgs/tools/misc/vimer/default.nix
index a655aa9502e5..a655aa9502e5 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 e9733c7ef799..e9733c7ef799 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 1b1512db3cfe..1b1512db3cfe 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 c98b9a000147..c98b9a000147 100644
--- a/pkgs/tools/misc/vimpager/latest.nix
+++ b/nixpkgs/pkgs/tools/misc/vimpager/latest.nix
diff --git a/pkgs/tools/misc/vivid/default.nix b/nixpkgs/pkgs/tools/misc/vivid/default.nix
index 856bda755cb4..856bda755cb4 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 e5bb23016ae9..e5bb23016ae9 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 be8745802dad..be8745802dad 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 90b721ad58ae..90b721ad58ae 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 9ae1ee0b17eb..9ae1ee0b17eb 100644
--- a/pkgs/tools/misc/vttest/default.nix
+++ b/nixpkgs/pkgs/tools/misc/vttest/default.nix
diff --git a/pkgs/tools/misc/wakatime/default.nix b/nixpkgs/pkgs/tools/misc/wakatime/default.nix
index 4f1ca8f89ceb..4f1ca8f89ceb 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 b0471e56c078..b0471e56c078 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 a276b13a59ca..a276b13a59ca 100644
--- a/pkgs/tools/misc/websocat/default.nix
+++ b/nixpkgs/pkgs/tools/misc/websocat/default.nix
diff --git a/pkgs/tools/misc/wl-clipboard/default.nix b/nixpkgs/pkgs/tools/misc/wl-clipboard/default.nix
index 00e26d762a44..00e26d762a44 100644
--- a/pkgs/tools/misc/wl-clipboard/default.nix
+++ b/nixpkgs/pkgs/tools/misc/wl-clipboard/default.nix
diff --git a/pkgs/tools/misc/woeusb/default.nix b/nixpkgs/pkgs/tools/misc/woeusb/default.nix
index 12a97a2e8e46..12a97a2e8e46 100644
--- a/pkgs/tools/misc/woeusb/default.nix
+++ b/nixpkgs/pkgs/tools/misc/woeusb/default.nix
diff --git a/pkgs/tools/misc/woof/default.nix b/nixpkgs/pkgs/tools/misc/woof/default.nix
index 35da2e0a4e94..35da2e0a4e94 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 f19d448e5fc2..f19d448e5fc2 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 b9a8f70ff71a..b9a8f70ff71a 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 df34d24af942..df34d24af942 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 1029dbb29d8c..1029dbb29d8c 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 f4a397ed9ddc..f4a397ed9ddc 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 aad5b35c79ff..aad5b35c79ff 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 79565af8e926..79565af8e926 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 8260d7921ecc..8260d7921ecc 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 c33e01fa0e71..c33e01fa0e71 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 7d7942f7ca98..7d7942f7ca98 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 444b14c5a63f..444b14c5a63f 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 d0f358446952..d0f358446952 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 d8959687945a..d8959687945a 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 3be931a362be..3be931a362be 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 f51746e312e5..f51746e312e5 100644
--- a/pkgs/tools/misc/xiccd/default.nix
+++ b/nixpkgs/pkgs/tools/misc/xiccd/default.nix
diff --git a/pkgs/tools/misc/xmonad-log/default.nix b/nixpkgs/pkgs/tools/misc/xmonad-log/default.nix
index 7a092e595621..7a092e595621 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 f5a7c7e5dd1d..f5a7c7e5dd1d 100644
--- a/pkgs/tools/misc/xmonad-log/deps.nix
+++ b/nixpkgs/pkgs/tools/misc/xmonad-log/deps.nix
diff --git a/pkgs/tools/misc/xsel/default.nix b/nixpkgs/pkgs/tools/misc/xsel/default.nix
index 0ec7d58598f8..0ec7d58598f8 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 fb4257b35e6b..fb4257b35e6b 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 90a9610a7ce9..90a9610a7ce9 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 bfc2a03e6cb8..bfc2a03e6cb8 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 946a07d17b46..946a07d17b46 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 0e88e79eb1ba..0e88e79eb1ba 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 303722aac0b8..303722aac0b8 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 c00b832b9615..c00b832b9615 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 8aaa8e22994d..8aaa8e22994d 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 b5c5aca0883b..b5c5aca0883b 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 a1d0b185a0a9..a1d0b185a0a9 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 939191b5c8f2..939191b5c8f2 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 acc0bac04ff6..acc0bac04ff6 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 d11a3a1cc6d9..d11a3a1cc6d9 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 405ff745baaf..405ff745baaf 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 9caf4cf07b87..9caf4cf07b87 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 9b0f5e477a1c..9b0f5e477a1c 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 2218bb5a57a9..2218bb5a57a9 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 b74ab51680d1..b74ab51680d1 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 2bf015acf5f5..2bf015acf5f5 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 61945266e13b..61945266e13b 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 108071edb64c..108071edb64c 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/acme-client/default.nix b/nixpkgs/pkgs/tools/networking/acme-client/default.nix
index 1e10529082f5..1e10529082f5 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 4b03c3cf2787..4b03c3cf2787 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 f367d2817cd1..f367d2817cd1 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 c53cce49a388..c53cce49a388 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 f6b3c5a91468..f6b3c5a91468 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 77648e2fbfbc..77648e2fbfbc 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 1febe36898b2..1febe36898b2 100644
--- a/pkgs/tools/networking/airfield/node-packages.nix
+++ b/nixpkgs/pkgs/tools/networking/airfield/node-packages.nix
diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/nixpkgs/pkgs/tools/networking/airfield/node.nix
index 0983d3e127be..0983d3e127be 100644
--- a/pkgs/tools/package-management/nixui/nixui.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 a77fd56f6739..a77fd56f6739 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 bd9cae162244..bd9cae162244 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 dccab1796fbc..dccab1796fbc 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 8b9d1e3b704c..8b9d1e3b704c 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 8d9ec9288114..8d9ec9288114 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 4358d22142d9..4358d22142d9 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 cedd8597870b..cedd8597870b 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 7904ffb0d04e..7904ffb0d04e 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 de8bcc8e7ff6..de8bcc8e7ff6 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 e6d5abc17618..e6d5abc17618 100644
--- a/pkgs/tools/networking/atftp/default.nix
+++ b/nixpkgs/pkgs/tools/networking/atftp/default.nix
diff --git a/pkgs/tools/networking/autossh/default.nix b/nixpkgs/pkgs/tools/networking/autossh/default.nix
index 55b464607b11..55b464607b11 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 fa435b6c66ad..fa435b6c66ad 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 7dfc8e9d7ad8..7dfc8e9d7ad8 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 c9ebc12b0db8..c9ebc12b0db8 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 2a85ba7cb519..2a85ba7cb519 100644
--- a/pkgs/tools/networking/badvpn/default.upstream
+++ b/nixpkgs/pkgs/tools/networking/badvpn/default.upstream
diff --git a/pkgs/tools/networking/bgpdump/default.nix b/nixpkgs/pkgs/tools/networking/bgpdump/default.nix
index 55b168a21aec..55b168a21aec 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 93a98a10daad..93a98a10daad 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 0fc083f9096f..0fc083f9096f 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 068d51229cb1..068d51229cb1 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 dec74c72fbe7..dec74c72fbe7 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 a9a8d5e43e3b..a9a8d5e43e3b 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 d011665a492b..d011665a492b 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 24decb60281f..24decb60281f 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 386642614bc9..386642614bc9 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 34b227d5a6d3..34b227d5a6d3 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 81dd294d786a..81dd294d786a 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 993e9ad74692..993e9ad74692 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 a06b409ca49b..a06b409ca49b 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 75a05108b8bf..75a05108b8bf 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 7cc89bebf477..7cc89bebf477 100644
--- a/pkgs/tools/networking/carddav-util/default.nix
+++ b/nixpkgs/pkgs/tools/networking/carddav-util/default.nix
diff --git a/pkgs/tools/networking/ccnet/default.nix b/nixpkgs/pkgs/tools/networking/ccnet/default.nix
index 6fac4a282d01..6fac4a282d01 100644
--- a/pkgs/tools/networking/ccnet/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ccnet/default.nix
diff --git a/pkgs/tools/networking/chrony/default.nix b/nixpkgs/pkgs/tools/networking/chrony/default.nix
index 33f004190e40..33f004190e40 100644
--- a/pkgs/tools/networking/chrony/default.nix
+++ b/nixpkgs/pkgs/tools/networking/chrony/default.nix
diff --git a/pkgs/tools/networking/cjdns/default.nix b/nixpkgs/pkgs/tools/networking/cjdns/default.nix
index 82fbfac842a5..82fbfac842a5 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 3098b091dc64..3098b091dc64 100644
--- a/pkgs/tools/networking/cksfv/default.nix
+++ b/nixpkgs/pkgs/tools/networking/cksfv/default.nix
diff --git a/pkgs/tools/networking/cmst/default.nix b/nixpkgs/pkgs/tools/networking/cmst/default.nix
index cc88153bab9c..cc88153bab9c 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 6267e3a7790d..6267e3a7790d 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 3d63340adb0b..3d63340adb0b 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 d5688354a76d..d5688354a76d 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 8c4d4fa84865..8c4d4fa84865 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 42b0c37411c8..42b0c37411c8 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 c39c82df634c..c39c82df634c 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 7c42cc965a00..7c42cc965a00 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 a4e8c17a545e..a4e8c17a545e 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/nixpkgs/pkgs/tools/networking/connman/default.nix
diff --git a/pkgs/tools/networking/corkscrew/default.nix b/nixpkgs/pkgs/tools/networking/corkscrew/default.nix
index 9394b123bbe6..9394b123bbe6 100644
--- a/pkgs/tools/networking/corkscrew/default.nix
+++ b/nixpkgs/pkgs/tools/networking/corkscrew/default.nix
diff --git a/pkgs/tools/networking/curl-unix-socket/default.nix b/nixpkgs/pkgs/tools/networking/curl-unix-socket/default.nix
index e6f2dec30e6a..e6f2dec30e6a 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 bd502ee34c66..bd502ee34c66 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/nixpkgs/pkgs/tools/networking/curl/default.nix
diff --git a/pkgs/tools/networking/cutter/default.nix b/nixpkgs/pkgs/tools/networking/cutter/default.nix
index 28eab7f495aa..28eab7f495aa 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 4ec23862522e..4ec23862522e 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 e69e012f644a..e69e012f644a 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 9897a76c957d..9897a76c957d 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 02bdb3e2a460..02bdb3e2a460 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 8cff23b9574c..8cff23b9574c 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 1121ec0405c1..1121ec0405c1 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 fbf7efb69339..fbf7efb69339 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 2a81702feee9..2a81702feee9 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 25ce4bcd68eb..25ce4bcd68eb 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 edf7a8faaf86..edf7a8faaf86 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 6efba72b1dcf..6efba72b1dcf 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 6987bc553a58..6987bc553a58 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 7aa9d0814514..7aa9d0814514 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 6d14789e7f42..6d14789e7f42 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 8ed9d1d1d706..8ed9d1d1d706 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 d557c0ab9adb..d557c0ab9adb 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 fd306a0bcca3..fd306a0bcca3 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 d4837d28c825..d4837d28c825 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 b8a7133e7bc7..b8a7133e7bc7 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 abd9e756a21f..abd9e756a21f 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 7fddd1213834..7fddd1213834 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 c0b2c795a40b..c0b2c795a40b 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 b9df976d3a9f..b9df976d3a9f 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 a43900ea4a52..a43900ea4a52 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 315e12cc155e..315e12cc155e 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 afe00d7a3547..afe00d7a3547 100644
--- a/pkgs/tools/networking/dnsperf/default.nix
+++ b/nixpkgs/pkgs/tools/networking/dnsperf/default.nix
diff --git a/pkgs/tools/networking/dnstop/default.nix b/nixpkgs/pkgs/tools/networking/dnstop/default.nix
index 207078773b26..207078773b26 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 5261fdb18960..5261fdb18960 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 bf0a43ce5153..bf0a43ce5153 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 c51f0a4fdf02..c51f0a4fdf02 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 2ce08b05799d..2ce08b05799d 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 50a3c98af0f7..50a3c98af0f7 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 3c6c5f3d2992..3c6c5f3d2992 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 d7ff19612eb1..d7ff19612eb1 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 82688fa79460..82688fa79460 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 12d9da87b39b..12d9da87b39b 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 d8c60882cd4a..d8c60882cd4a 100644
--- a/pkgs/tools/networking/email/default.nix
+++ b/nixpkgs/pkgs/tools/networking/email/default.nix
diff --git a/pkgs/tools/networking/envoy/default.nix b/nixpkgs/pkgs/tools/networking/envoy/default.nix
index 83af542b8ad4..83af542b8ad4 100644
--- a/pkgs/tools/networking/envoy/default.nix
+++ b/nixpkgs/pkgs/tools/networking/envoy/default.nix
diff --git a/pkgs/tools/networking/envoy/nixos.patch b/nixpkgs/pkgs/tools/networking/envoy/nixos.patch
index 04b63a2dde92..04b63a2dde92 100644
--- a/pkgs/tools/networking/envoy/nixos.patch
+++ b/nixpkgs/pkgs/tools/networking/envoy/nixos.patch
diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/nixpkgs/pkgs/tools/networking/eternal-terminal/default.nix
index 607b11aaffb9..607b11aaffb9 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 9737108e6acf..9737108e6acf 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 ef356935c56a..ef356935c56a 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 54e205390666..54e205390666 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 a0b298f3f4ec..a0b298f3f4ec 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 f9e334d81962..f9e334d81962 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 24c262195086..24c262195086 100644
--- a/pkgs/tools/networking/filegive/deps.nix
+++ b/nixpkgs/pkgs/tools/networking/filegive/deps.nix
diff --git a/pkgs/tools/networking/flannel/default.nix b/nixpkgs/pkgs/tools/networking/flannel/default.nix
index 259225e0b7c8..259225e0b7c8 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 b5e61bee4dfe..b5e61bee4dfe 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 4b5242818b3d..4b5242818b3d 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 3f89323de36b..3f89323de36b 100644
--- a/pkgs/tools/networking/freebind/default.nix
+++ b/nixpkgs/pkgs/tools/networking/freebind/default.nix
diff --git a/pkgs/tools/networking/gandi-cli/default.nix b/nixpkgs/pkgs/tools/networking/gandi-cli/default.nix
index 913cba54ae88..913cba54ae88 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 6181093a193e..6181093a193e 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 d8d4353f7820..d8d4353f7820 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 6fdcfaa70db0..6fdcfaa70db0 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 e94c3e4330fb..e94c3e4330fb 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 127036577f38..127036577f38 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 db63b16415b2..db63b16415b2 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 e5df4b8e4fe7..e5df4b8e4fe7 100644
--- a/pkgs/tools/networking/gnirehtet/paths.patch
+++ b/nixpkgs/pkgs/tools/networking/gnirehtet/paths.patch
diff --git a/pkgs/tools/networking/goklp/default.nix b/nixpkgs/pkgs/tools/networking/goklp/default.nix
index 88a6b74686c2..88a6b74686c2 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 2f6481f237f8..2f6481f237f8 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 85f13f031b4d..85f13f031b4d 100644
--- a/pkgs/tools/networking/gping/default.nix
+++ b/nixpkgs/pkgs/tools/networking/gping/default.nix
diff --git a/pkgs/tools/networking/grpcurl/default.nix b/nixpkgs/pkgs/tools/networking/grpcurl/default.nix
index 10100b933d4d..10100b933d4d 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 52afa88708f3..52afa88708f3 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 e5e775e50fea..e5e775e50fea 100644
--- a/pkgs/tools/networking/grpcurl/deps-linux.nix
+++ b/nixpkgs/pkgs/tools/networking/grpcurl/deps-linux.nix
diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/nixpkgs/pkgs/tools/networking/gupnp-tools/default.nix
index 830d27fa6ce2..830d27fa6ce2 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 bcc68a2a19f7..bcc68a2a19f7 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 9cfb6472c4e1..9cfb6472c4e1 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 6fd4ab361630..6fd4ab361630 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 62ac791252d8..62ac791252d8 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 ba76c37a4bba..ba76c37a4bba 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 3fdebbf49662..3fdebbf49662 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 913e76c0f4ba..913e76c0f4ba 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 c8e14ad7f697..c8e14ad7f697 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 78dc52905d83..78dc52905d83 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 fa8bbb91c5be..fa8bbb91c5be 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 2a608bf809ac..2a608bf809ac 100644
--- a/pkgs/tools/networking/httpie/default.nix
+++ b/nixpkgs/pkgs/tools/networking/httpie/default.nix
diff --git a/pkgs/tools/networking/httping/default.nix b/nixpkgs/pkgs/tools/networking/httping/default.nix
index abde3f2a380d..abde3f2a380d 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 8ec0ce2847dd..8ec0ce2847dd 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 d1640ebc43df..d1640ebc43df 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 21fc08a39a9e..21fc08a39a9e 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 5a29657bd5b1..5a29657bd5b1 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 c47dd03cb9d0..c47dd03cb9d0 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 7049659d503d..7049659d503d 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 8109cd96ac23..8109cd96ac23 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 ae51bb69bda1..ae51bb69bda1 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 69d12f25a80e..69d12f25a80e 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 cbcaee4de784..cbcaee4de784 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 2745c8c1d84d..2745c8c1d84d 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 74031eb7aef7..74031eb7aef7 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 050f1c9cd4a5..050f1c9cd4a5 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 8b7f4e1c2a04..8b7f4e1c2a04 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 96723146ad41..96723146ad41 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 5b54e4099f56..5b54e4099f56 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 c05928fa34b9..c05928fa34b9 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 47352d21c4a2..47352d21c4a2 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 612e3ec0f835..612e3ec0f835 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 2592989a90a3..2592989a90a3 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 e34516313c57..e34516313c57 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 d63d4e29daf0..d63d4e29daf0 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/infiniband-diags/default.nix b/nixpkgs/pkgs/tools/networking/infiniband-diags/default.nix
index 81a43d672fdc..81a43d672fdc 100644
--- a/pkgs/tools/networking/infiniband-diags/default.nix
+++ b/nixpkgs/pkgs/tools/networking/infiniband-diags/default.nix
diff --git a/pkgs/tools/networking/iodine/default.nix b/nixpkgs/pkgs/tools/networking/iodine/default.nix
index 5aa0c01e8485..5aa0c01e8485 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 c37b409cdfb5..c37b409cdfb5 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 3c2e7f53beeb..3c2e7f53beeb 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 549461fe5d0b..549461fe5d0b 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 26c8d89b5d48..26c8d89b5d48 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 6494b907a3a9..6494b907a3a9 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 2f06180128a8..2f06180128a8 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 6ea930fccaab..6ea930fccaab 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 9b4edd763057..9b4edd763057 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 e62d819e1ec0..e62d819e1ec0 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 47aeb8574b68..47aeb8574b68 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 65928a373009..65928a373009 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 29fe71c9365a..29fe71c9365a 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 c26025a82392..c26025a82392 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 e9f43da981c5..e9f43da981c5 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 170eddbad794..170eddbad794 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 7877200116d1..7877200116d1 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 ee5d2fb8271f..ee5d2fb8271f 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 a1c156475fb4..a1c156475fb4 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 385113d160f6..385113d160f6 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 43d0944a4159..43d0944a4159 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 b4886f58cbb1..b4886f58cbb1 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 ef753127c67e..ef753127c67e 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 9a0b8c9ebf54..9a0b8c9ebf54 100644
--- a/pkgs/tools/networking/libreswan/default.nix
+++ b/nixpkgs/pkgs/tools/networking/libreswan/default.nix
diff --git a/pkgs/tools/networking/libreswan/libreswan-3.18-glibc-2.26.patch b/nixpkgs/pkgs/tools/networking/libreswan/libreswan-3.18-glibc-2.26.patch
index 33c44f617a0a..33c44f617a0a 100644
--- a/pkgs/tools/networking/libreswan/libreswan-3.18-glibc-2.26.patch
+++ b/nixpkgs/pkgs/tools/networking/libreswan/libreswan-3.18-glibc-2.26.patch
diff --git a/pkgs/tools/networking/linkchecker/add-no-robots-flag.patch b/nixpkgs/pkgs/tools/networking/linkchecker/add-no-robots-flag.patch
index 270ef2c02e1e..270ef2c02e1e 100644
--- a/pkgs/tools/networking/linkchecker/add-no-robots-flag.patch
+++ b/nixpkgs/pkgs/tools/networking/linkchecker/add-no-robots-flag.patch
diff --git a/pkgs/tools/networking/linkchecker/default.nix b/nixpkgs/pkgs/tools/networking/linkchecker/default.nix
index acc6893d0cd5..acc6893d0cd5 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 a8e4f2dc83f5..a8e4f2dc83f5 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 c5c7e18ba6d2..c5c7e18ba6d2 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 5d788af1682e..5d788af1682e 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 9dd81de3fbc1..9dd81de3fbc1 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 6a6156855c51..6a6156855c51 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 134e9b6df76d..134e9b6df76d 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 08988f6cde50..08988f6cde50 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 642fd739335a..642fd739335a 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 3d9862a3de21..3d9862a3de21 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 f507e4dc2872..f507e4dc2872 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 b28dfc5d99ca..b28dfc5d99ca 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/fix-test-ali-awk.patch b/nixpkgs/pkgs/tools/networking/mailutils/fix-test-ali-awk.patch
index 3d301d530def..3d301d530def 100644
--- a/pkgs/tools/networking/mailutils/fix-test-ali-awk.patch
+++ b/nixpkgs/pkgs/tools/networking/mailutils/fix-test-ali-awk.patch
diff --git a/pkgs/tools/networking/mailutils/path-to-cat.patch b/nixpkgs/pkgs/tools/networking/mailutils/path-to-cat.patch
index 698ee08f340f..698ee08f340f 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 cf3ea24c436f..cf3ea24c436f 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 c456210217e5..c456210217e5 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 3a48814928e5..3a48814928e5 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 3469d76ea65d..3469d76ea65d 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 a7648fd59c35..a7648fd59c35 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 db09a8e8f1ec..db09a8e8f1ec 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 eda93c82cce8..eda93c82cce8 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 c995eea7b14d..c995eea7b14d 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 ae8d3d964832..ae8d3d964832 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 56a101b31573..56a101b31573 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 3a3ca03f18ae..3a3ca03f18ae 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 9809b330faba..9809b330faba 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 84b31bd5d40c..84b31bd5d40c 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 42ae85a8e6b1..42ae85a8e6b1 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 f65c0c63370b..f65c0c63370b 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 babfcf1db216..babfcf1db216 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 ee331648e75f..ee331648e75f 100644
--- a/pkgs/tools/networking/mitmproxy/default.nix
+++ b/nixpkgs/pkgs/tools/networking/mitmproxy/default.nix
diff --git a/pkgs/tools/networking/modem-manager/default.nix b/nixpkgs/pkgs/tools/networking/modem-manager/default.nix
index 6f0732b8cfdf..6f0732b8cfdf 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 98d2625aade9..98d2625aade9 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 cb2a650718ab..cb2a650718ab 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 a981708ffadf..a981708ffadf 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 0329bedd07f3..0329bedd07f3 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 5a8af7de36a0..5a8af7de36a0 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 8f10901038d6..8f10901038d6 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 3c2ced1712fd..3c2ced1712fd 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 75462659699c..75462659699c 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 a352596eed05..a352596eed05 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 f9df781715ac..f9df781715ac 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 90ac44aa375a..90ac44aa375a 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 43018e401f1e..43018e401f1e 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 255d430a3a5d..255d430a3a5d 100644
--- a/pkgs/tools/networking/ndjbdns/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ndjbdns/default.nix
diff --git a/pkgs/tools/networking/netalyzr/default.nix b/nixpkgs/pkgs/tools/networking/netalyzr/default.nix
index 8f8cf929e9d4..8f8cf929e9d4 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 7a1eac59eeae..7a1eac59eeae 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 47ec804e5d48..47ec804e5d48 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 eac95a32008c..eac95a32008c 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 de53cfdd224c..de53cfdd224c 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 e9704c4babe6..e9704c4babe6 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 d10125e09a65..d10125e09a65 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 702fee86922e..702fee86922e 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 062d6e2d0a9c..062d6e2d0a9c 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 fdfa446907c1..fdfa446907c1 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 c5613341aab1..c5613341aab1 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 17c2966b7064..17c2966b7064 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 9ebc080ba96f..9ebc080ba96f 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 f7df0740ba17..f7df0740ba17 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 f2c83c661ae3..f2c83c661ae3 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 665db4cc287b..665db4cc287b 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 068b9c8266b8..068b9c8266b8 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 938fcbdc7719..938fcbdc7719 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 f4ffe620e744..f4ffe620e744 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 a1241b6738c2..a1241b6738c2 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 a480fd6d91e7..a480fd6d91e7 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 d3eb3f799336..d3eb3f799336 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 d32dbfadbafa..d32dbfadbafa 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 5dffdb4ca3fb..5dffdb4ca3fb 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 531672c39362..531672c39362 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 566179d85b36..566179d85b36 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 9b342f5bd08b..9b342f5bd08b 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 fa764788e2c6..fa764788e2c6 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 b735da28dca1..b735da28dca1 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 17460bc72f70..17460bc72f70 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 3231c276be5b..3231c276be5b 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 98238ac01f76..98238ac01f76 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 5ad3adfc9153..5ad3adfc9153 100644
--- a/pkgs/tools/networking/nfdump/default.nix
+++ b/nixpkgs/pkgs/tools/networking/nfdump/default.nix
diff --git a/pkgs/tools/networking/ngrep/default.nix b/nixpkgs/pkgs/tools/networking/ngrep/default.nix
index 9cddc5bbd877..9cddc5bbd877 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 d0aec7889efa..d0aec7889efa 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 1db3c3e65191..1db3c3e65191 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 686bb1d7ebf3..686bb1d7ebf3 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 7908a1524e59..7908a1524e59 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 591e54a6f815..591e54a6f815 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 c63d7ac057b1..c63d7ac057b1 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 9f83949e8de0..9f83949e8de0 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 b199d850f971..b199d850f971 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 d794efeac08a..d794efeac08a 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 50ed1daebd48..50ed1daebd48 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/default.nix b/nixpkgs/pkgs/tools/networking/ntopng/default.nix
index 06d28e844ff3..06d28e844ff3 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 a990cb1ee927..a990cb1ee927 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 c75536dac7fb..c75536dac7fb 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 2ed9c330181c..2ed9c330181c 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 02491d7660ea..02491d7660ea 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 5c8f98101eed..5c8f98101eed 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 901187c6abb9..901187c6abb9 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 af7c4401daec..af7c4401daec 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 005abb0968b6..005abb0968b6 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 c93e94e2f287..c93e94e2f287 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 805c4bd55207..805c4bd55207 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 16734df1fb0d..16734df1fb0d 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/nixpkgs/pkgs/tools/networking/offlineimap/default.nix
diff --git a/pkgs/tools/networking/olsrd/default.nix b/nixpkgs/pkgs/tools/networking/olsrd/default.nix
index 8fa30a5c2211..8fa30a5c2211 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 4f2a26de3271..4f2a26de3271 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 154788b3c5d3..154788b3c5d3 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 d261e5717052..d261e5717052 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 2672996a0952..2672996a0952 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 019806fcd572..019806fcd572 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 209e1f64c72b..209e1f64c72b 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 d52cc9d8defb..d52cc9d8defb 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 6ce574b9cdc4..6ce574b9cdc4 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 23f3ab67a087..23f3ab67a087 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 3fe4a21ea47e..3fe4a21ea47e 100644
--- a/pkgs/tools/networking/openssh/locale_archive.patch
+++ b/nixpkgs/pkgs/tools/networking/openssh/locale_archive.patch
diff --git a/pkgs/tools/networking/openvpn/default.nix b/nixpkgs/pkgs/tools/networking/openvpn/default.nix
index 732687ecfa15..732687ecfa15 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 35b577ac37ec..35b577ac37ec 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 706f2434a955..706f2434a955 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 e96aa25feded..e96aa25feded 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/p2p/amule/default.nix b/nixpkgs/pkgs/tools/networking/p2p/amule/default.nix
index b9a4360abfb9..b9a4360abfb9 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/amule/upnp-1.8.patch b/nixpkgs/pkgs/tools/networking/p2p/amule/upnp-1.8.patch
index 3f5502582a25..3f5502582a25 100644
--- a/pkgs/tools/networking/p2p/amule/upnp-1.8.patch
+++ b/nixpkgs/pkgs/tools/networking/p2p/amule/upnp-1.8.patch
diff --git a/pkgs/tools/networking/p2p/azureus/builder.sh b/nixpkgs/pkgs/tools/networking/p2p/azureus/builder.sh
index 9d41dba2e439..9d41dba2e439 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 4fcfc251f3fa..4fcfc251f3fa 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 fe9a5695a4b3..fe9a5695a4b3 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 9c6f5eec11b7..9c6f5eec11b7 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 63652557efa5..63652557efa5 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 2a89e419b2e4..2a89e419b2e4 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 8c043294143e..8c043294143e 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 d770a51dc820..d770a51dc820 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 6bad14421b98..6bad14421b98 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 fbb17308f90c..fbb17308f90c 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 f2c92d689f35..f2c92d689f35 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 71d1e6fa6d6e..71d1e6fa6d6e 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 92df5d55524b..92df5d55524b 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 10c004ecd94f..10c004ecd94f 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 f5c74cfb511f..f5c74cfb511f 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 854ad617cd26..854ad617cd26 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 5dff64e27c5c..5dff64e27c5c 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 e585af81991e..e585af81991e 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 8d75ea413eca..8d75ea413eca 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 e6cf997f2e7c..e6cf997f2e7c 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 2d13515d83d7..2d13515d83d7 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 5d410685c0d0..5d410685c0d0 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 b082a981ae74..b082a981ae74 100644
--- a/pkgs/tools/networking/pixiewps/default.nix
+++ b/nixpkgs/pkgs/tools/networking/pixiewps/default.nix
diff --git a/pkgs/tools/networking/polygraph/default.nix b/nixpkgs/pkgs/tools/networking/polygraph/default.nix
index bdc6e7b67f7d..bdc6e7b67f7d 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 2a70218f2879..2a70218f2879 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 26dc71b7d619..26dc71b7d619 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 030cc97d157f..030cc97d157f 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 c74935c0ec8b..c74935c0ec8b 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 df6faaf8383d..df6faaf8383d 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 03270ce87881..03270ce87881 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 4c29cd949ee6..4c29cd949ee6 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 36700195a1bd..36700195a1bd 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 56bd46427d86..56bd46427d86 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 36d0150a49b5..36d0150a49b5 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 22c359620507..22c359620507 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 9e06a6441456..9e06a6441456 100644
--- a/pkgs/tools/networking/pwnat/default.nix
+++ b/nixpkgs/pkgs/tools/networking/pwnat/default.nix
diff --git a/pkgs/tools/networking/pykms/default.nix b/nixpkgs/pkgs/tools/networking/pykms/default.nix
index 15ac5bceea33..15ac5bceea33 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 581405f63c05..581405f63c05 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 a15dd9689433..a15dd9689433 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 22589582e3b9..22589582e3b9 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 3d7dc68e3578..3d7dc68e3578 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 88498e542807..88498e542807 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 0ed1150159d2..0ed1150159d2 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 98466a800a34..98466a800a34 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 5e18ee80f99d..5e18ee80f99d 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 2d239180a93d..2d239180a93d 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 ed48feabb85a..ed48feabb85a 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 e584354952a4..e584354952a4 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 641513eaf472..641513eaf472 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 37f542319dad..37f542319dad 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 2beb8aec3893..2beb8aec3893 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 e74a3554dc29..e74a3554dc29 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 3814af60112e..3814af60112e 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 49c5d600be2f..49c5d600be2f 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 8088cc0ec4d9..8088cc0ec4d9 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 36c539a40b41..36c539a40b41 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 b42b3ff5b739..b42b3ff5b739 100644
--- a/pkgs/tools/networking/s6-networking/default.nix
+++ b/nixpkgs/pkgs/tools/networking/s6-networking/default.nix
diff --git a/pkgs/tools/networking/samplicator/default.nix b/nixpkgs/pkgs/tools/networking/samplicator/default.nix
index 5cb65b78ee8b..5cb65b78ee8b 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 8a2dee19b957..8a2dee19b957 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 26e932fc5d5e..26e932fc5d5e 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 668d55d89273..668d55d89273 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 be2bc6a75a17..be2bc6a75a17 100644
--- a/pkgs/tools/networking/shncpd/default.nix
+++ b/nixpkgs/pkgs/tools/networking/shncpd/default.nix
diff --git a/pkgs/tools/networking/siege/default.nix b/nixpkgs/pkgs/tools/networking/siege/default.nix
index a0a659974148..a0a659974148 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 476e7dc229df..476e7dc229df 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 5b046c6eeab7..5b046c6eeab7 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 908e4b05009f..908e4b05009f 100644
--- a/pkgs/tools/networking/sipsak/default.nix
+++ b/nixpkgs/pkgs/tools/networking/sipsak/default.nix
diff --git a/pkgs/tools/networking/skydive/default.nix b/nixpkgs/pkgs/tools/networking/skydive/default.nix
index e72147937445..e72147937445 100644
--- a/pkgs/tools/networking/skydive/default.nix
+++ b/nixpkgs/pkgs/tools/networking/skydive/default.nix
diff --git a/pkgs/tools/networking/skydive/deps.nix b/nixpkgs/pkgs/tools/networking/skydive/deps.nix
index c573a7231bb6..c573a7231bb6 100644
--- a/pkgs/tools/networking/skydive/deps.nix
+++ b/nixpkgs/pkgs/tools/networking/skydive/deps.nix
diff --git a/pkgs/tools/networking/slack-cli/default.nix b/nixpkgs/pkgs/tools/networking/slack-cli/default.nix
index 91b868a017f5..91b868a017f5 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 8632a33e3498..8632a33e3498 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 3515a127510f..3515a127510f 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 08b5e6a211b8..08b5e6a211b8 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 cdf14f5af33f..cdf14f5af33f 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 11af161893fb..11af161893fb 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 ec62c105c62c..ec62c105c62c 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 cf66033584eb..cf66033584eb 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 58e4c716bba0..58e4c716bba0 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 ad2d88e4a982..ad2d88e4a982 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 8893c5e37fe0..8893c5e37fe0 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 f56f2c0f2f0a..f56f2c0f2f0a 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 7d3f773b1930..7d3f773b1930 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 84e7558713c9..84e7558713c9 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 01903171e9c2..01903171e9c2 100644
--- a/pkgs/tools/networking/ssh-ident/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ssh-ident/default.nix
diff --git a/pkgs/tools/networking/sshpass/default.nix b/nixpkgs/pkgs/tools/networking/sshpass/default.nix
index 94221a359c1d..94221a359c1d 100644
--- a/pkgs/tools/networking/sshpass/default.nix
+++ b/nixpkgs/pkgs/tools/networking/sshpass/default.nix
diff --git a/pkgs/tools/networking/ssldump/default.nix b/nixpkgs/pkgs/tools/networking/ssldump/default.nix
index adda38c184d9..adda38c184d9 100644
--- a/pkgs/tools/networking/ssldump/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ssldump/default.nix
diff --git a/pkgs/tools/networking/ssmtp/default.nix b/nixpkgs/pkgs/tools/networking/ssmtp/default.nix
index ebe31dc8b5a9..ebe31dc8b5a9 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 371c0f6de2b3..371c0f6de2b3 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 7bbc872c98e1..7bbc872c98e1 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 1bd864d859c5..1bd864d859c5 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 397537ad8d84..397537ad8d84 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 12c446c8c9aa..12c446c8c9aa 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 f01da7d7bce6..f01da7d7bce6 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 89af381d0d6d..89af381d0d6d 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 7ba4a0d89362..7ba4a0d89362 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 66a6c28d92a8..66a6c28d92a8 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 2a4cf3506df8..2a4cf3506df8 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 34095c814284..34095c814284 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 80daf6447efa..80daf6447efa 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 4fc456523f7d..4fc456523f7d 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 2abdab773ddf..2abdab773ddf 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 515fcee6963b..515fcee6963b 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 97bcbdc999eb..97bcbdc999eb 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 8a4722aa5214..8a4722aa5214 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 1df0f2c37fc2..1df0f2c37fc2 100644
--- a/pkgs/tools/networking/tcpflow/default.nix
+++ b/nixpkgs/pkgs/tools/networking/tcpflow/default.nix
diff --git a/pkgs/tools/networking/tcpflow/default.upstream b/nixpkgs/pkgs/tools/networking/tcpflow/default.upstream
index 72802e4d0469..72802e4d0469 100644
--- a/pkgs/tools/networking/tcpflow/default.upstream
+++ b/nixpkgs/pkgs/tools/networking/tcpflow/default.upstream
diff --git a/pkgs/tools/networking/tcpreplay/default.nix b/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix
index 53af27b4deba..53af27b4deba 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 cfb627e8b3b9..cfb627e8b3b9 100644
--- a/pkgs/tools/networking/tcptraceroute/default.nix
+++ b/nixpkgs/pkgs/tools/networking/tcptraceroute/default.nix
diff --git a/pkgs/tools/networking/telepresence/default.nix b/nixpkgs/pkgs/tools/networking/telepresence/default.nix
index 7c883ebdc55b..7c883ebdc55b 100644
--- a/pkgs/tools/networking/telepresence/default.nix
+++ b/nixpkgs/pkgs/tools/networking/telepresence/default.nix
diff --git a/pkgs/tools/networking/termshark/default.nix b/nixpkgs/pkgs/tools/networking/termshark/default.nix
index 3361127afede..3361127afede 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 bc97d5d8d6e4..bc97d5d8d6e4 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 a9e9f351aae3..a9e9f351aae3 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 a17f382557ac..a17f382557ac 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 df9eb9bdad25..df9eb9bdad25 100644
--- a/pkgs/tools/networking/tinc/pre.nix
+++ b/nixpkgs/pkgs/tools/networking/tinc/pre.nix
diff --git a/pkgs/tools/networking/tinyproxy/default.nix b/nixpkgs/pkgs/tools/networking/tinyproxy/default.nix
index c9a6599708c6..c9a6599708c6 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 b992fef2253f..b992fef2253f 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 f72d004c291b..f72d004c291b 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 ccb9f3bc0d6b..ccb9f3bc0d6b 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 c3abdd49e138..c3abdd49e138 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 3d3be5d4532c..3d3be5d4532c 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 7a4adc14c2df..7a4adc14c2df 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 5f5edcb23a79..5f5edcb23a79 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 6170718b6184..6170718b6184 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 0cb8ad5a4376..0cb8ad5a4376 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 e59b9f239a68..e59b9f239a68 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 f6afddaba381..f6afddaba381 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 8a3b292ad81f..8a3b292ad81f 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 dd6933208046..dd6933208046 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 4ee4fa418335..4ee4fa418335 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 cc93da7f2533..cc93da7f2533 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 b35c3e8c883e..b35c3e8c883e 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 861a61c8f38f..861a61c8f38f 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 f41aa35df90e..f41aa35df90e 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 010d6a7f8e85..010d6a7f8e85 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 3e572a10da0a..3e572a10da0a 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 7cb489a3f213..7cb489a3f213 100644
--- a/pkgs/tools/networking/uwimap/default.nix
+++ b/nixpkgs/pkgs/tools/networking/uwimap/default.nix
diff --git a/pkgs/tools/networking/vde2/default.nix b/nixpkgs/pkgs/tools/networking/vde2/default.nix
index ac87a5c10e9f..ac87a5c10e9f 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 1684da45ccc3..1684da45ccc3 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 6a23c81569f0..6a23c81569f0 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 89a8cd6da952..89a8cd6da952 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 fa12abe9b776..fa12abe9b776 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 d2cbb5d8a4ee..d2cbb5d8a4ee 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 ff96509e15c5..ff96509e15c5 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 fefff8573816..fefff8573816 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 0c97f20ee65f..0c97f20ee65f 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 e9b9452c7563..e9b9452c7563 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 1e93948be68b..1e93948be68b 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 38a24eddc288..38a24eddc288 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 a6a1fcfcb37b..a6a1fcfcb37b 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 5ec3199fb897..5ec3199fb897 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 9f67dd4e2c30..9f67dd4e2c30 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 fbda1caacb7a..fbda1caacb7a 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 31b47bb45881..31b47bb45881 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 138dfbabfd5c..138dfbabfd5c 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 31e553b46b50..31e553b46b50 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 785cae7b6ed5..785cae7b6ed5 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 b01f0e5a438a..b01f0e5a438a 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 f015e50d684a..f015e50d684a 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 a794f6caaeee..a794f6caaeee 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 650375cbbaae..650375cbbaae 100644
--- a/pkgs/tools/networking/wicd/wpa2-ttls
+++ b/nixpkgs/pkgs/tools/networking/wicd/wpa2-ttls
diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/nixpkgs/pkgs/tools/networking/wireguard-go/default.nix
index a537e4dfb266..a537e4dfb266 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 6ebef971e599..6ebef971e599 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 2b6b8317a1e8..2b6b8317a1e8 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 f918949a0277..f918949a0277 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 e549228e8f1f..e549228e8f1f 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 570d800311e2..570d800311e2 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 05bf8d5dd11c..05bf8d5dd11c 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 5dd2f3b74fdc..5dd2f3b74fdc 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 e2e638ad485b..e2e638ad485b 100644
--- a/pkgs/tools/networking/wrk2/default.nix
+++ b/nixpkgs/pkgs/tools/networking/wrk2/default.nix
diff --git a/pkgs/tools/networking/wuzz/default.nix b/nixpkgs/pkgs/tools/networking/wuzz/default.nix
index b13e5dee18c7..b13e5dee18c7 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 8904596a712d..8904596a712d 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 1b9d55349030..1b9d55349030 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 4b39594d84ee..4b39594d84ee 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 e898904c6d4b..e898904c6d4b 100644
--- a/pkgs/tools/networking/xnbd/default.nix
+++ b/nixpkgs/pkgs/tools/networking/xnbd/default.nix
diff --git a/pkgs/tools/networking/yrd/default.nix b/nixpkgs/pkgs/tools/networking/yrd/default.nix
index e5d260ef7d42..e5d260ef7d42 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 137a9216df00..137a9216df00 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 7cac5a455700..7cac5a455700 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 2853c595e431..2853c595e431 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 ac64e135c2fe..ac64e135c2fe 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 898026a62902..898026a62902 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 f108962b3bad..f108962b3bad 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 827d52987673..827d52987673 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 625a6ecc39e0..625a6ecc39e0 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 fa4288c2f944..fa4288c2f944 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 3742d22c0212..3742d22c0212 100644
--- a/pkgs/tools/nix/nix-script/default.nix
+++ b/nixpkgs/pkgs/tools/nix/nix-script/default.nix
diff --git a/pkgs/tools/nix/nixdoc/default.nix b/nixpkgs/pkgs/tools/nix/nixdoc/default.nix
index 69f4fc435c91..69f4fc435c91 100644
--- a/pkgs/tools/nix/nixdoc/default.nix
+++ b/nixpkgs/pkgs/tools/nix/nixdoc/default.nix
diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/nixpkgs/pkgs/tools/package-management/appimage-run/default.nix
index 426cc7943e5a..426cc7943e5a 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 21e869b7b01e..21e869b7b01e 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 9725cef5ba7d..9725cef5ba7d 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 bcf96a50d36a..bcf96a50d36a 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 46da85d97488..46da85d97488 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 0f45084f3c05..0f45084f3c05 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-download/Cargo.nix b/nixpkgs/pkgs/tools/package-management/cargo-download/Cargo.nix
index 9735bde199dc..9735bde199dc 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/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-download/default.nix
index 398e007c3702..398e007c3702 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 8ddb8eb231b3..8ddb8eb231b3 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 5e635f0fc26f..5e635f0fc26f 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 7137f8b7fb18..7137f8b7fb18 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 619fbb115976..619fbb115976 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/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-outdated/default.nix
index 71567df94036..71567df94036 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-release/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-release/default.nix
index 2521a2ceebf6..2521a2ceebf6 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 8b654188c51a..8b654188c51a 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 1bd8aadf4982..1bd8aadf4982 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 50dc748e07ef..50dc748e07ef 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 e45906688ada..e45906688ada 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 6605d9de65ae..6605d9de65ae 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 9a3e29c84c12..9a3e29c84c12 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 a811e4afbb97..a811e4afbb97 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 7f8cbccae8e5..7f8cbccae8e5 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 02066134b2ed..02066134b2ed 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 a860607fcf66..a860607fcf66 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 ae40100a9804..ae40100a9804 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 58840f491ecf..58840f491ecf 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 c8be7f0b5e26..c8be7f0b5e26 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 158db426c615..158db426c615 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 71dd78618081..71dd78618081 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 0a0cae32dcf5..0a0cae32dcf5 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 e184cc8facc0..e184cc8facc0 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 a247c6d9fe47..a247c6d9fe47 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 f75bf6bf1625..f75bf6bf1625 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 a55fd33f8991..a55fd33f8991 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 7a58ec04e64d..7a58ec04e64d 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 14c07df6ffa8..14c07df6ffa8 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 f13256d33bfb..f13256d33bfb 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 b97eab9777d7..b97eab9777d7 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 a551368eade1..a551368eade1 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 1f70dc1c8c8c..1f70dc1c8c8c 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 d310b41d7aaf..d310b41d7aaf 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/fpm/Gemfile b/nixpkgs/pkgs/tools/package-management/fpm/Gemfile
index 17ed0a0cb2af..17ed0a0cb2af 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 1045c7b495a0..1045c7b495a0 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 905c686fede7..905c686fede7 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 13d1669e5409..13d1669e5409 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/fpm/update b/nixpkgs/pkgs/tools/package-management/fpm/update
index 22d1e52e2977..22d1e52e2977 100755
--- a/pkgs/tools/package-management/fpm/update
+++ b/nixpkgs/pkgs/tools/package-management/fpm/update
diff --git a/pkgs/tools/package-management/gx/default.nix b/nixpkgs/pkgs/tools/package-management/gx/default.nix
index 4c03fc35dea4..4c03fc35dea4 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 766e58775b42..766e58775b42 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 0ae0b8a19835..0ae0b8a19835 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 895e0e6bb1ac..895e0e6bb1ac 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 ffa9f427dc2f..ffa9f427dc2f 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 c35550597a34..c35550597a34 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 51a963497fa2..51a963497fa2 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 fdae5ef39ee2..fdae5ef39ee2 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 41471b2c8a7a..41471b2c8a7a 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 ea3d97ca67ea..ea3d97ca67ea 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/niff/default.nix b/nixpkgs/pkgs/tools/package-management/niff/default.nix
index 8c6a72cf131e..8c6a72cf131e 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 7c02d2d9a638..7c02d2d9a638 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 9b666dbfa642..9b666dbfa642 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 62e0bc81afaf..62e0bc81afaf 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 efedb8b67da9..efedb8b67da9 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 c23db106ea1f..c23db106ea1f 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 96a283a8ea8a..96a283a8ea8a 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-review/default.nix b/nixpkgs/pkgs/tools/package-management/nix-review/default.nix
index 43e261b106bf..43e261b106bf 100644
--- a/pkgs/tools/package-management/nix-review/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/nix-review/default.nix
diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/nixpkgs/pkgs/tools/package-management/nix-serve/default.nix
index 660dce347a5b..660dce347a5b 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 cd3a8507be14..cd3a8507be14 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 a4e43f149677..a4e43f149677 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 a2add8f8a78e..a2add8f8a78e 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 8749ae009da3..8749ae009da3 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 462c9e615a13..462c9e615a13 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 fd47f8895fd4..fd47f8895fd4 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 aa037b48b4f5..aa037b48b4f5 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 b60e3aee3402..b60e3aee3402 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 2e0523bb25cc..2e0523bb25cc 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/default.nix b/nixpkgs/pkgs/tools/package-management/nixops/default.nix
index c761a3a47793..c761a3a47793 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 7da38f83e7fe..7da38f83e7fe 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 79400a8e5ea0..79400a8e5ea0 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 ce31de9f65d3..ce31de9f65d3 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 d9ba324dce72..d9ba324dce72 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 94975807dea6..94975807dea6 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/nixui/default.nix b/nixpkgs/pkgs/tools/package-management/nixui/default.nix
index 804bbbdf8d71..804bbbdf8d71 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 334edb4a027a..334edb4a027a 100755
--- a/pkgs/tools/package-management/nixui/generate.sh
+++ b/nixpkgs/pkgs/tools/package-management/nixui/generate.sh
diff --git a/nixpkgs/pkgs/tools/package-management/nixui/nixui.nix b/nixpkgs/pkgs/tools/package-management/nixui/nixui.nix
new file mode 100644
index 000000000000..0983d3e127be
--- /dev/null
+++ b/nixpkgs/pkgs/tools/package-management/nixui/nixui.nix
@@ -0,0 +1,17 @@
+# This file has been generated by node2nix 1.7.0. Do not edit!
+
+{pkgs ? import <nixpkgs> {
+    inherit system;
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
+
+let
+  nodeEnv = import ../../../development/node-packages/node-env.nix {
+    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit nodejs;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+  };
+in
+import ./node-packages.nix {
+  inherit (pkgs) fetchurl fetchgit;
+  inherit nodeEnv;
+}
\ No newline at end of file
diff --git a/pkgs/tools/package-management/nixui/node-packages.nix b/nixpkgs/pkgs/tools/package-management/nixui/node-packages.nix
index 07e3cd896f63..07e3cd896f63 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 551df4f1b1c9..551df4f1b1c9 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 c22a8a5e85ec..c22a8a5e85ec 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 e82dc7a2c266..e82dc7a2c266 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 8575f126e624..8575f126e624 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 e02c0a2c66ff..e02c0a2c66ff 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 2e9f93177e45..2e9f93177e45 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 f0f05a4c858e..f0f05a4c858e 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 d756b679bf3d..d756b679bf3d 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/python2nix/default.nix b/nixpkgs/pkgs/tools/package-management/python2nix/default.nix
index 1a7c24e2c38a..1a7c24e2c38a 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 4e2c8a7b3a7a..4e2c8a7b3a7a 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 55171e6d38f7..55171e6d38f7 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 569161d9f2e4..569161d9f2e4 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 d29b46b87bed..d29b46b87bed 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 68b9194015b1..68b9194015b1 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 246a2c5d9917..246a2c5d9917 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 c67c758b933d..c67c758b933d 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 0b0d4e80fbca..0b0d4e80fbca 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 2ee0c478212c..2ee0c478212c 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 c5844702ef38..c5844702ef38 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 5dfbfd780f1c..5dfbfd780f1c 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-patches/qemu-2.10.0-glibc-2.27.patch b/nixpkgs/pkgs/tools/security/afl/qemu-patches/qemu-2.10.0-glibc-2.27.patch
index 6cc663dc1fb9..6cc663dc1fb9 100644
--- a/pkgs/tools/security/afl/qemu-patches/qemu-2.10.0-glibc-2.27.patch
+++ b/nixpkgs/pkgs/tools/security/afl/qemu-patches/qemu-2.10.0-glibc-2.27.patch
diff --git a/pkgs/tools/security/afl/qemu.nix b/nixpkgs/pkgs/tools/security/afl/qemu.nix
index 9e0f19361fb0..9e0f19361fb0 100644
--- a/pkgs/tools/security/afl/qemu.nix
+++ b/nixpkgs/pkgs/tools/security/afl/qemu.nix
diff --git a/pkgs/tools/security/aide/default.nix b/nixpkgs/pkgs/tools/security/aide/default.nix
index 1513ae58a0b6..1513ae58a0b6 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 abc22647d52f..abc22647d52f 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 db490c7822f8..db490c7822f8 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 9edf50b4b599..9edf50b4b599 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 ca2ea67e7881..ca2ea67e7881 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 44282d5f9643..44282d5f9643 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 36b6a5767a1e..36b6a5767a1e 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 180aa69d56c5..180aa69d56c5 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 16811d8f8897..16811d8f8897 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 59be6ed0ec26..59be6ed0ec26 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 c72bc6d8b9e8..c72bc6d8b9e8 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 ef09a821317e..ef09a821317e 100644
--- a/pkgs/tools/security/bettercap/deps.nix
+++ b/nixpkgs/pkgs/tools/security/bettercap/deps.nix
diff --git a/pkgs/tools/security/bitwarden-cli/default.nix b/nixpkgs/pkgs/tools/security/bitwarden-cli/default.nix
index 5c60eb9f4e2f..5c60eb9f4e2f 100644
--- a/pkgs/tools/security/bitwarden-cli/default.nix
+++ b/nixpkgs/pkgs/tools/security/bitwarden-cli/default.nix
diff --git a/pkgs/tools/security/bitwarden-cli/generate.sh b/nixpkgs/pkgs/tools/security/bitwarden-cli/generate.sh
index 5bcee4c0513a..5bcee4c0513a 100755
--- a/pkgs/tools/security/bitwarden-cli/generate.sh
+++ b/nixpkgs/pkgs/tools/security/bitwarden-cli/generate.sh
diff --git a/pkgs/tools/security/bitwarden-cli/node-packages-generated.nix b/nixpkgs/pkgs/tools/security/bitwarden-cli/node-packages-generated.nix
index e258571a6207..e258571a6207 100644
--- a/pkgs/tools/security/bitwarden-cli/node-packages-generated.nix
+++ b/nixpkgs/pkgs/tools/security/bitwarden-cli/node-packages-generated.nix
diff --git a/pkgs/tools/security/bitwarden-cli/node-packages.json b/nixpkgs/pkgs/tools/security/bitwarden-cli/node-packages.json
index 624aa87bcbea..624aa87bcbea 100644
--- a/pkgs/tools/security/bitwarden-cli/node-packages.json
+++ b/nixpkgs/pkgs/tools/security/bitwarden-cli/node-packages.json
diff --git a/pkgs/tools/security/bitwarden-cli/node-packages.nix b/nixpkgs/pkgs/tools/security/bitwarden-cli/node-packages.nix
index 6fb6421eb2db..6fb6421eb2db 100644
--- a/pkgs/tools/security/bitwarden-cli/node-packages.nix
+++ b/nixpkgs/pkgs/tools/security/bitwarden-cli/node-packages.nix
diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix
index d22a2773fd9d..d22a2773fd9d 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 44c8047684fd..44c8047684fd 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 9faedf0c7ef9..9faedf0c7ef9 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 966383163e60..966383163e60 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 69444d1612e8..69444d1612e8 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 f9fb0e329bd4..f9fb0e329bd4 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 28cbcf5a9a66..28cbcf5a9a66 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 8b19b6103d4a..8b19b6103d4a 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 56d78b3e8f16..56d78b3e8f16 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 6fbcffdae290..6fbcffdae290 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 77a15e2f27c7..77a15e2f27c7 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 a025c69b7381..a025c69b7381 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 e0935f0f7606..e0935f0f7606 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 750539b3ace8..750539b3ace8 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 3c6f52a4c7f6..3c6f52a4c7f6 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 7dbd60c73c42..7dbd60c73c42 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 2d7ee0d9a734..2d7ee0d9a734 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 54843453c868..54843453c868 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 8b8449a6e661..8b8449a6e661 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 a32752f8b231..a32752f8b231 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 1d85ba0b5669..1d85ba0b5669 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 9c379adb7dfb..9c379adb7dfb 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 d3163a026f91..d3163a026f91 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 602c0d60a5f1..602c0d60a5f1 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 2dc9336bb329..2dc9336bb329 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 a4afa772d10e..a4afa772d10e 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 4d9beb654ece..4d9beb654ece 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 c5ace5d2e8c4..c5ace5d2e8c4 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 2a88e4462b6d..2a88e4462b6d 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 3e94d52fc5fc..3e94d52fc5fc 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 1e0618412210..1e0618412210 100644
--- a/pkgs/tools/security/ctmg/default.nix
+++ b/nixpkgs/pkgs/tools/security/ctmg/default.nix
diff --git a/pkgs/tools/security/default.nix b/nixpkgs/pkgs/tools/security/default.nix
index c5987d37889c..c5987d37889c 100644
--- a/pkgs/tools/security/default.nix
+++ b/nixpkgs/pkgs/tools/security/default.nix
diff --git a/pkgs/tools/security/diceware/default.nix b/nixpkgs/pkgs/tools/security/diceware/default.nix
index 1c3d5f1d465f..1c3d5f1d465f 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 ee97bda19064..ee97bda19064 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 d764e8a71ae6..d764e8a71ae6 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 06270723f4d0..06270723f4d0 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 55335927b36a..55335927b36a 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 10e2138494e5..10e2138494e5 100644
--- a/pkgs/tools/security/duo-unix/default.nix
+++ b/nixpkgs/pkgs/tools/security/duo-unix/default.nix
diff --git a/pkgs/tools/security/ecdsautils/default.nix b/nixpkgs/pkgs/tools/security/ecdsautils/default.nix
index 48a713287b8b..48a713287b8b 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 d0d01761c246..d0d01761c246 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 40a728f6cb1a..40a728f6cb1a 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 1d983cb8599a..1d983cb8599a 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 155c63c87e13..155c63c87e13 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 636b4c1ee118..636b4c1ee118 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 8d4cc6ec3ca6..8d4cc6ec3ca6 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 8d0c78764319..8d0c78764319 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 a4a3b919e648..a4a3b919e648 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 c33e433448f5..c33e433448f5 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 f8ec715cb5e4..f8ec715cb5e4 100644
--- a/pkgs/tools/security/enpass/update_script.py
+++ b/nixpkgs/pkgs/tools/security/enpass/update_script.py
diff --git a/pkgs/tools/security/eschalot/default.nix b/nixpkgs/pkgs/tools/security/eschalot/default.nix
index d628a28023a4..d628a28023a4 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 6b1d8e6c4f88..6b1d8e6c4f88 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 5d2e515c3277..5d2e515c3277 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 8e508ec1f596..8e508ec1f596 100644
--- a/pkgs/tools/security/fcrackzip/fcrackzip_forkexec.patch
+++ b/nixpkgs/pkgs/tools/security/fcrackzip/fcrackzip_forkexec.patch
diff --git a/pkgs/tools/security/fierce/default.nix b/nixpkgs/pkgs/tools/security/fierce/default.nix
index abc1bacd212b..abc1bacd212b 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 66a50e268a53..66a50e268a53 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 84727f55b933..84727f55b933 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 14a4c985d502..14a4c985d502 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 812c032230c1..812c032230c1 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 ca7793281ef9..ca7793281ef9 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 27bdc51c7688..27bdc51c7688 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 49c7b0b4d9d1..49c7b0b4d9d1 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 71cda94d5f8a..71cda94d5f8a 100644
--- a/pkgs/tools/security/ghidra/default.nix
+++ b/nixpkgs/pkgs/tools/security/ghidra/default.nix
diff --git a/pkgs/tools/security/gnu-pw-mgr/default.nix b/nixpkgs/pkgs/tools/security/gnu-pw-mgr/default.nix
index 2139b7c84afc..2139b7c84afc 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/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 061fb0e8de9c..061fb0e8de9c 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 b86bb1a221c6..b86bb1a221c6 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 371a7ca67afd..371a7ca67afd 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 6ae2bbc436ed..6ae2bbc436ed 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 ecb1df73e397..ecb1df73e397 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 842785e5c932..842785e5c932 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 a5432f8e3d95..a5432f8e3d95 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 65804bac7642..65804bac7642 100644
--- a/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch
+++ b/nixpkgs/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch
diff --git a/pkgs/tools/security/gopass/default.nix b/nixpkgs/pkgs/tools/security/gopass/default.nix
index b8be17e49967..b8be17e49967 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 152ff40e7a22..152ff40e7a22 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 c095b77129cc..c095b77129cc 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 2b1708c9243c..2b1708c9243c 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 385a201d88b0..385a201d88b0 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 0c5691a1e106..0c5691a1e106 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 a28822ecd951..a28822ecd951 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 50508cfc4941..50508cfc4941 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 72a13c0f259e..72a13c0f259e 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 81f627179a25..81f627179a25 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 20ad5bbc0b27..20ad5bbc0b27 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 e6c375599a92..e6c375599a92 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 a9b66da2a9c0..a9b66da2a9c0 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 cec31cec3771..cec31cec3771 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 5731f3ef8bb6..5731f3ef8bb6 100644
--- a/pkgs/tools/security/ifdnfc/default.nix
+++ b/nixpkgs/pkgs/tools/security/ifdnfc/default.nix
diff --git a/pkgs/tools/security/jd-gui/default.nix b/nixpkgs/pkgs/tools/security/jd-gui/default.nix
index 2eda19088376..2eda19088376 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 d4db02cc9ed1..d4db02cc9ed1 100644
--- a/pkgs/tools/security/john/default.nix
+++ b/nixpkgs/pkgs/tools/security/john/default.nix
diff --git a/pkgs/tools/security/keybase/default.nix b/nixpkgs/pkgs/tools/security/keybase/default.nix
index 8b832bf00d65..8b832bf00d65 100644
--- a/pkgs/tools/security/keybase/default.nix
+++ b/nixpkgs/pkgs/tools/security/keybase/default.nix
diff --git a/pkgs/tools/security/keybase/gui.nix b/nixpkgs/pkgs/tools/security/keybase/gui.nix
index f84f0039347e..f84f0039347e 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 302e996213dd..302e996213dd 100644
--- a/pkgs/tools/security/keybase/kbfs.nix
+++ b/nixpkgs/pkgs/tools/security/keybase/kbfs.nix
diff --git a/pkgs/tools/security/knockknock/default.nix b/nixpkgs/pkgs/tools/security/knockknock/default.nix
index ce7663b18cf9..ce7663b18cf9 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 350d0e66dc7d..350d0e66dc7d 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 57174148160d..57174148160d 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 4ceb3c5d92da..4ceb3c5d92da 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 fedf3421fb1c..fedf3421fb1c 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 37da20225205..37da20225205 100644
--- a/pkgs/tools/security/lastpass-cli/default.nix
+++ b/nixpkgs/pkgs/tools/security/lastpass-cli/default.nix
diff --git a/pkgs/tools/security/libacr38u/default.nix b/nixpkgs/pkgs/tools/security/libacr38u/default.nix
index d858ed3fd6d3..d858ed3fd6d3 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 b3dc1270fb9c..b3dc1270fb9c 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 8a73d056b1ed..8a73d056b1ed 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 7579636cfbf5..7579636cfbf5 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 e33681c45e0e..e33681c45e0e 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 24a7ea51a82c..24a7ea51a82c 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 308b94231e76..308b94231e76 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 99d7556db2db..99d7556db2db 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 a84e3d08f438..a84e3d08f438 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 37796fef1747..37796fef1747 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 938817cb64f6..938817cb64f6 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 cd7a01214c6a..cd7a01214c6a 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 3d4bdd2edf17..3d4bdd2edf17 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 1ae18e343537..1ae18e343537 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 f5bc7a60839e..f5bc7a60839e 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 0c927b7501b6..0c927b7501b6 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 3d30fef02e29..3d30fef02e29 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 5d1cfdd40232..5d1cfdd40232 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 71bdd3af55de..71bdd3af55de 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 98384c754ce7..98384c754ce7 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 6ec90cd15a85..6ec90cd15a85 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 e1a134ec5d18..e1a134ec5d18 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 8cdd85017b93..8cdd85017b93 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 2a9a1fc8dfa9..2a9a1fc8dfa9 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 4cff17ef8495..4cff17ef8495 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 2e83c691dc7f..2e83c691dc7f 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 84b738a21092..84b738a21092 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 88494e8dbdf7..88494e8dbdf7 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 e7f7547e4ad9..e7f7547e4ad9 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 a89fa7238269..a89fa7238269 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 3bc5758aad44..3bc5758aad44 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 c0b7a72d18e0..c0b7a72d18e0 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 3cd39750c881..3cd39750c881 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 221817b004df..221817b004df 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 363eefe36921..363eefe36921 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 f88156285ca7..f88156285ca7 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 a27ed7bad1a5..a27ed7bad1a5 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 9e154c19a9c0..9e154c19a9c0 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 91df7f3fbb0a..91df7f3fbb0a 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 dc0644f2a016..dc0644f2a016 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 898bfb599a31..898bfb599a31 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 98f2e56e7497..98f2e56e7497 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 eff2211a71c5..eff2211a71c5 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 769b87fa8d31..769b87fa8d31 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 7231f6821daf..7231f6821daf 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 ea6e9c54a9ae..ea6e9c54a9ae 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 11e1f14baf9a..11e1f14baf9a 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 21f58ef517ee..21f58ef517ee 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 d7d1f1c40d47..d7d1f1c40d47 100644
--- a/pkgs/tools/security/paperkey/default.nix
+++ b/nixpkgs/pkgs/tools/security/paperkey/default.nix
diff --git a/pkgs/tools/security/pass/default.nix b/nixpkgs/pkgs/tools/security/pass/default.nix
index 8ddbd60a38d1..8ddbd60a38d1 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 79dd1fadb01c..79dd1fadb01c 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/default.nix b/nixpkgs/pkgs/tools/security/pass/extensions/default.nix
index 96d79a8daceb..96d79a8daceb 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 ba3f821e88c6..ba3f821e88c6 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 0ee775bfbe8b..0ee775bfbe8b 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 6d35c4aa8375..6d35c4aa8375 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 b9f458cd4e12..b9f458cd4e12 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 dd145b069720..dd145b069720 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 e8f7e138ff02..e8f7e138ff02 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 6140159dcb50..6140159dcb50 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 f3a844ad2d6d..f3a844ad2d6d 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 a97bc57ad45f..a97bc57ad45f 100644
--- a/pkgs/tools/security/passff-host/default.nix
+++ b/nixpkgs/pkgs/tools/security/passff-host/default.nix
diff --git a/pkgs/tools/security/pcsc-cyberjack/default.nix b/nixpkgs/pkgs/tools/security/pcsc-cyberjack/default.nix
index 23a744f8e23d..23a744f8e23d 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 88ca8a3d1b1a..88ca8a3d1b1a 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 6e7ffd60f72f..6e7ffd60f72f 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 5c40ccdef584..5c40ccdef584 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 6e6734c95432..6e6734c95432 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 24519654e9a5..24519654e9a5 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 55d2505ed1cb..55d2505ed1cb 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 9c8f47cd2756..9c8f47cd2756 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 93dc75c1f32d..93dc75c1f32d 100644
--- a/pkgs/tools/security/phrasendrescher/default.nix
+++ b/nixpkgs/pkgs/tools/security/phrasendrescher/default.nix
diff --git a/pkgs/tools/security/pinentry/default.nix b/nixpkgs/pkgs/tools/security/pinentry/default.nix
index ba7ef7a3cfdd..ba7ef7a3cfdd 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 8168aa94b3d2..8168aa94b3d2 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 fba92bd47acb..fba92bd47acb 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 559911699680..559911699680 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 5ddda50cb015..5ddda50cb015 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 b24af50ee7c2..b24af50ee7c2 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 afaed796057c..afaed796057c 100644
--- a/pkgs/tools/security/proxmark3/default.nix
+++ b/nixpkgs/pkgs/tools/security/proxmark3/default.nix
diff --git a/pkgs/tools/security/pwgen/default.nix b/nixpkgs/pkgs/tools/security/pwgen/default.nix
index 79e8fb071b37..79e8fb071b37 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 17bbf982255b..17bbf982255b 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 f8b110ce2213..f8b110ce2213 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 7a78233dbced..7a78233dbced 100644
--- a/pkgs/tools/security/radamsa/default.nix
+++ b/nixpkgs/pkgs/tools/security/radamsa/default.nix
diff --git a/pkgs/tools/security/rarcrack/default.nix b/nixpkgs/pkgs/tools/security/rarcrack/default.nix
index 3491feccc45c..3491feccc45c 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 5e622cf68f35..5e622cf68f35 100644
--- a/pkgs/tools/security/rhash/default.nix
+++ b/nixpkgs/pkgs/tools/security/rhash/default.nix
diff --git a/pkgs/tools/security/rng-tools/default.nix b/nixpkgs/pkgs/tools/security/rng-tools/default.nix
index 41faa375f83d..41faa375f83d 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 888d3bb4018a..888d3bb4018a 100644
--- a/pkgs/tools/security/saml2aws/default.nix
+++ b/nixpkgs/pkgs/tools/security/saml2aws/default.nix
diff --git a/pkgs/tools/security/saml2aws/deps.nix b/nixpkgs/pkgs/tools/security/saml2aws/deps.nix
index 08a26db91b10..08a26db91b10 100644
--- a/pkgs/tools/security/saml2aws/deps.nix
+++ b/nixpkgs/pkgs/tools/security/saml2aws/deps.nix
diff --git a/pkgs/tools/security/sbsigntool/autoconf.patch b/nixpkgs/pkgs/tools/security/sbsigntool/autoconf.patch
index f436a73bca72..f436a73bca72 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 1091b366781d..1091b366781d 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 75ea92a786c5..75ea92a786c5 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 352a81b2727a..352a81b2727a 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 a2ec48d4d270..a2ec48d4d270 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 fd03e6bebabc..fd03e6bebabc 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 343992a6322f..343992a6322f 100644
--- a/pkgs/tools/security/sedutil/default.nix
+++ b/nixpkgs/pkgs/tools/security/sedutil/default.nix
diff --git a/pkgs/tools/security/sha1collisiondetection/default.nix b/nixpkgs/pkgs/tools/security/sha1collisiondetection/default.nix
index 38da14484147..38da14484147 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 e3f5f72c1414..e3f5f72c1414 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 a642a12b0bd0..a642a12b0bd0 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 8148692327ef..8148692327ef 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 4beaf5b80887..4beaf5b80887 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 96565ec84b52..96565ec84b52 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 ec5eea52a6f8..ec5eea52a6f8 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 fcc455422148..fcc455422148 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 a1844668af65..a1844668af65 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 9782d00267f5..9782d00267f5 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 1ff9c73d8b58..1ff9c73d8b58 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 e615cec945dd..e615cec945dd 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 18f010ee1ecb..18f010ee1ecb 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 0e0e8c7ad753..0e0e8c7ad753 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 6e8634bd4a1f..6e8634bd4a1f 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 d3a8f35d9148..d3a8f35d9148 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 3bbcdafcdcdd..3bbcdafcdcdd 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 c8be366066be..c8be366066be 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 373316c78406..373316c78406 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 a8df1735e9d4..a8df1735e9d4 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 ca66b9c544f5..ca66b9c544f5 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/stoken/default.nix b/nixpkgs/pkgs/tools/security/stoken/default.nix
index d28260ffb8b9..d28260ffb8b9 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 ecc34ede556b..ecc34ede556b 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 56e40d514bb1..56e40d514bb1 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 9714943b30d5..9714943b30d5 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 15f767415890..15f767415890 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 350306a24f4b..350306a24f4b 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 1f00d42f2774..1f00d42f2774 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 f159dd27c42a..f159dd27c42a 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 a16ba9f4fbab..a16ba9f4fbab 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 4d0feef72c9f..4d0feef72c9f 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 9a7a245b8134..9a7a245b8134 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 4a1e92e6104a..4a1e92e6104a 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 b3b71a16eb88..b3b71a16eb88 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 170d5c4ff7a4..170d5c4ff7a4 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 686d03b7c3fa..686d03b7c3fa 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 c944883d4178..c944883d4178 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 7d0ff797336d..7d0ff797336d 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-quote-tools/default.nix b/nixpkgs/pkgs/tools/security/tpm-quote-tools/default.nix
index 1541575aed74..1541575aed74 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 1944cf236e1e..1944cf236e1e 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-tools/default.nix b/nixpkgs/pkgs/tools/security/tpm2-tools/default.nix
index 1a6c8aaaa5d2..1a6c8aaaa5d2 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 774a14f72bab..774a14f72bab 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 8309390d013b..8309390d013b 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 9492f2bb6eac..9492f2bb6eac 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 3f366a583204..3f366a583204 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/nixpkgs/pkgs/tools/security/vault/default.nix
diff --git a/pkgs/tools/security/volatility/default.nix b/nixpkgs/pkgs/tools/security/volatility/default.nix
index e3b7fb643a26..e3b7fb643a26 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 2f7986c128b5..2f7986c128b5 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 a7c337dc1222..a7c337dc1222 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 2df3a1eec6a0..2df3a1eec6a0 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 5d76cd24f3ea..5d76cd24f3ea 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 bf03aba14181..bf03aba14181 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 85455325f695..85455325f695 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 c0ad80bd99b1..c0ad80bd99b1 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 7fcb9fc10bd1..7fcb9fc10bd1 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 f98b4295e9e6..f98b4295e9e6 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 dc2cfe81746a..dc2cfe81746a 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 669c91adf10d..669c91adf10d 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 95fa1047fe54..95fa1047fe54 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 501311e96724..501311e96724 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 a31fdd08c60d..a31fdd08c60d 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 142d33d359dc..142d33d359dc 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 41a35a789538..41a35a789538 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 a8fca06c3618..a8fca06c3618 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 6d191f33a64d..6d191f33a64d 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 cd4770bf609a..cd4770bf609a 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 9c6f21009ee3..9c6f21009ee3 100644
--- a/pkgs/tools/system/bfs/default.nix
+++ b/nixpkgs/pkgs/tools/system/bfs/default.nix
diff --git a/pkgs/tools/system/bootchart/default.nix b/nixpkgs/pkgs/tools/system/bootchart/default.nix
index 9842bd85783a..9842bd85783a 100644
--- a/pkgs/tools/system/bootchart/default.nix
+++ b/nixpkgs/pkgs/tools/system/bootchart/default.nix
diff --git a/pkgs/tools/system/chase/default.nix b/nixpkgs/pkgs/tools/system/chase/default.nix
index 6dcaeed325ae..6dcaeed325ae 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 cc59aa5121c6..cc59aa5121c6 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 cb8c4cc7d029..cb8c4cc7d029 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 3fdc87808881..3fdc87808881 100644
--- a/pkgs/tools/system/collectd/default.nix
+++ b/nixpkgs/pkgs/tools/system/collectd/default.nix
diff --git a/pkgs/tools/system/colorls/Gemfile b/nixpkgs/pkgs/tools/system/colorls/Gemfile
index 0d41bd279ccb..0d41bd279ccb 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 583fd3b12028..583fd3b12028 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 45c3bdf1f40c..45c3bdf1f40c 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 e7264a895a2c..e7264a895a2c 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 3dc2a5caeb91..3dc2a5caeb91 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 74467ddf9cc7..74467ddf9cc7 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 35c57dd8ea91..35c57dd8ea91 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 aa047ca4a681..aa047ca4a681 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 effc879e4789..effc879e4789 100644
--- a/pkgs/tools/system/ctop/default.nix
+++ b/nixpkgs/pkgs/tools/system/ctop/default.nix
diff --git a/pkgs/tools/system/daemonize/default.nix b/nixpkgs/pkgs/tools/system/daemonize/default.nix
index 1067e524788b..1067e524788b 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 bcea40b1193f..bcea40b1193f 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 ca389a8e1b48..ca389a8e1b48 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 240cc36f7266..240cc36f7266 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 e0d11769fd9f..e0d11769fd9f 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 c2d3b33c7490..c2d3b33c7490 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 517cefb6a2b3..517cefb6a2b3 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 f8a6dac81976..f8a6dac81976 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 9a255c1b0ea6..9a255c1b0ea6 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 7d366dc9bd7f..7d366dc9bd7f 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 25f2673c0ac7..25f2673c0ac7 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 638b018fd415..638b018fd415 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 e77d44875820..e77d44875820 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 5f013157e32b..5f013157e32b 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 5a902914b37b..5a902914b37b 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 38ca06a6f322..38ca06a6f322 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 25470af9bb30..25470af9bb30 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 1a16a8a34c7f..1a16a8a34c7f 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 f8d4fb83d137..f8d4fb83d137 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 2bcab1c36b27..2bcab1c36b27 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 c0bbfc1ee3ef..c0bbfc1ee3ef 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 0aea3ced3b52..0aea3ced3b52 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 6dfc0991ed36..6dfc0991ed36 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 e25e6d790fc0..e25e6d790fc0 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 8fa9a213ab28..8fa9a213ab28 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 e97d71f5c84a..e97d71f5c84a 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 b35bd15c9749..b35bd15c9749 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 b3048f2fcb7f..b3048f2fcb7f 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 6626c9520ec1..6626c9520ec1 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 079494bb5990..079494bb5990 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 0c254bb28545..0c254bb28545 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 3cdb6291dfac..3cdb6291dfac 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 388836f6e5f4..388836f6e5f4 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 9eef3b064a0c..9eef3b064a0c 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 f6d63e460246..f6d63e460246 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 d58d19fd6ed1..d58d19fd6ed1 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 daf9ce58c911..daf9ce58c911 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 25d60ffca5dc..25d60ffca5dc 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 ea121b0e43c9..ea121b0e43c9 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 63a72aac79f2..63a72aac79f2 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 c9a21db71010..c9a21db71010 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 18c7cde2a086..18c7cde2a086 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 a6d1c1f872e9..a6d1c1f872e9 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 e0ff7d5ca8b4..e0ff7d5ca8b4 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 ab6d5307ebb8..ab6d5307ebb8 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 fcdcc23961b5..fcdcc23961b5 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 68c6ef3c3ef5..68c6ef3c3ef5 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 ff9376380569..ff9376380569 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 d1631776d393..d1631776d393 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 03373300a948..03373300a948 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 2afbed2f9bb2..2afbed2f9bb2 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 ae173ea29e62..ae173ea29e62 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 badc36650f0d..badc36650f0d 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 22dd9289bfd4..22dd9289bfd4 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 d7c1f89a7862..d7c1f89a7862 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 ad7715f0fe69..ad7715f0fe69 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 c906ad3c8cf1..c906ad3c8cf1 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 b553206f13ab..b553206f13ab 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 45e3a936825a..45e3a936825a 100644
--- a/pkgs/tools/system/ipmiutil/default.upstream
+++ b/nixpkgs/pkgs/tools/system/ipmiutil/default.upstream
diff --git a/pkgs/tools/system/journalbeat/default.nix b/nixpkgs/pkgs/tools/system/journalbeat/default.nix
index 35a006505434..35a006505434 100644
--- a/pkgs/tools/system/journalbeat/default.nix
+++ b/nixpkgs/pkgs/tools/system/journalbeat/default.nix
diff --git a/pkgs/tools/system/journalwatch/default.nix b/nixpkgs/pkgs/tools/system/journalwatch/default.nix
index e0aaee31217c..e0aaee31217c 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 697fc77d090a..697fc77d090a 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 c6866264a9b0..c6866264a9b0 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 ab11fc9e27f8..ab11fc9e27f8 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 eb7f1e3bb59b..eb7f1e3bb59b 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 39e1bc7b6e7d..39e1bc7b6e7d 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 4ec34a68122c..4ec34a68122c 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 e01636f2944f..e01636f2944f 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 0ab8d226f3a0..0ab8d226f3a0 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 cfc0c8f87ad7..cfc0c8f87ad7 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 1831041063b6..1831041063b6 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 d268ecb4a0ab..d268ecb4a0ab 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 d34fb939822d..d34fb939822d 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 74f0a84716a1..74f0a84716a1 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 282729f31459..282729f31459 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 078cc614bb42..078cc614bb42 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 5455728a10c2..5455728a10c2 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 c3927c29dd24..c3927c29dd24 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 5044e5c9a96a..5044e5c9a96a 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 19581c82c78f..19581c82c78f 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 60175d27f151..60175d27f151 100644
--- a/pkgs/tools/system/opencl-info/default.nix
+++ b/nixpkgs/pkgs/tools/system/opencl-info/default.nix
diff --git a/pkgs/tools/system/osquery/0001-Fix-CMake-configuration-for-Nix.patch b/nixpkgs/pkgs/tools/system/osquery/0001-Fix-CMake-configuration-for-Nix.patch
index b90752f8dc5b..b90752f8dc5b 100644
--- a/pkgs/tools/system/osquery/0001-Fix-CMake-configuration-for-Nix.patch
+++ b/nixpkgs/pkgs/tools/system/osquery/0001-Fix-CMake-configuration-for-Nix.patch
diff --git a/pkgs/tools/system/osquery/default.nix b/nixpkgs/pkgs/tools/system/osquery/default.nix
index 80341e88dd06..80341e88dd06 100644
--- a/pkgs/tools/system/osquery/default.nix
+++ b/nixpkgs/pkgs/tools/system/osquery/default.nix
diff --git a/pkgs/tools/system/pciutils/default.nix b/nixpkgs/pkgs/tools/system/pciutils/default.nix
index 22154796b317..22154796b317 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 b673c0f929a6..b673c0f929a6 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 809bde1122f3..809bde1122f3 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 c0d7134bcc59..c0d7134bcc59 100644
--- a/pkgs/tools/system/plan9port/builder.sh
+++ b/nixpkgs/pkgs/tools/system/plan9port/builder.sh
diff --git a/pkgs/tools/system/plan9port/default.nix b/nixpkgs/pkgs/tools/system/plan9port/default.nix
index b3909a79d942..b3909a79d942 100644
--- a/pkgs/tools/system/plan9port/default.nix
+++ b/nixpkgs/pkgs/tools/system/plan9port/default.nix
diff --git a/pkgs/tools/system/procodile/Gemfile b/nixpkgs/pkgs/tools/system/procodile/Gemfile
index 77e4bb430e96..77e4bb430e96 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 7989b7bf1f7f..7989b7bf1f7f 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 22dc59a9e8e6..22dc59a9e8e6 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 36ec2a9cf185..36ec2a9cf185 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 79b86f1383c0..79b86f1383c0 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 3e7bb301a6b9..3e7bb301a6b9 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 234aacbbfdee..234aacbbfdee 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 178e08938fea..178e08938fea 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 c9363ff3dbdf..c9363ff3dbdf 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 f399068b56ec..f399068b56ec 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 43d354107609..43d354107609 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 b918fe788b59..b918fe788b59 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 ee7626d27126..ee7626d27126 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 5a3ba8b66196..5a3ba8b66196 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 729a90aa317e..729a90aa317e 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 c8955ea57dc0..c8955ea57dc0 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 4d5de56fbf0d..4d5de56fbf0d 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 c65a037d5242..c65a037d5242 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 5d4ed355ba9d..5d4ed355ba9d 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 4f6fdd16dca7..4f6fdd16dca7 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 8b6393caff1c..8b6393caff1c 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 ed4fe7a68482..ed4fe7a68482 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 ce0779c0999c..ce0779c0999c 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 d6e8f4f1bb9f..d6e8f4f1bb9f 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 67145bc3cc54..67145bc3cc54 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 d35f56e25197..d35f56e25197 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 05d96afded14..05d96afded14 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 144b2be2d334..144b2be2d334 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 15a18a453f00..15a18a453f00 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 e3b58a50c925..e3b58a50c925 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 08f7f3039fb5..08f7f3039fb5 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 1595e8347e15..1595e8347e15 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 f407be7c5854..f407be7c5854 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 81e3a2b8792b..81e3a2b8792b 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 240ad9de19d1..240ad9de19d1 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 a57cafb54e25..a57cafb54e25 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 dcc9942a0611..dcc9942a0611 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 7230f55d309c..7230f55d309c 100644
--- a/pkgs/tools/system/systemd-journal2gelf/default.nix
+++ b/nixpkgs/pkgs/tools/system/systemd-journal2gelf/default.nix
diff --git a/pkgs/tools/system/systemd-journal2gelf/deps.nix b/nixpkgs/pkgs/tools/system/systemd-journal2gelf/deps.nix
index 2e0988e81054..2e0988e81054 100644
--- a/pkgs/tools/system/systemd-journal2gelf/deps.nix
+++ b/nixpkgs/pkgs/tools/system/systemd-journal2gelf/deps.nix
diff --git a/pkgs/tools/system/testdisk-photorec/default.nix b/nixpkgs/pkgs/tools/system/testdisk-photorec/default.nix
index 5342cf857acc..5342cf857acc 100644
--- a/pkgs/tools/system/testdisk-photorec/default.nix
+++ b/nixpkgs/pkgs/tools/system/testdisk-photorec/default.nix
diff --git a/pkgs/tools/system/thermald/default.nix b/nixpkgs/pkgs/tools/system/thermald/default.nix
index 818c76712c7e..818c76712c7e 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 dc63b97056a7..dc63b97056a7 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 4f52b5e09455..4f52b5e09455 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 cbb1fd88669a..cbb1fd88669a 100644
--- a/pkgs/tools/system/tm/default.nix
+++ b/nixpkgs/pkgs/tools/system/tm/default.nix
diff --git a/pkgs/tools/system/tree/default.nix b/nixpkgs/pkgs/tools/system/tree/default.nix
index a69a527f68fd..a69a527f68fd 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 79ba7d893040..79ba7d893040 100644
--- a/pkgs/tools/system/ts/default.nix
+++ b/nixpkgs/pkgs/tools/system/ts/default.nix
diff --git a/pkgs/tools/system/undaemonize/default.nix b/nixpkgs/pkgs/tools/system/undaemonize/default.nix
index 0f33a8d34c33..0f33a8d34c33 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 849baa7159ae..849baa7159ae 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 f591aad4b504..f591aad4b504 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 32cf56a1d74e..32cf56a1d74e 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 b252b74a0bdd..b252b74a0bdd 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 506b942e246e..506b942e246e 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 be2892e52e8d..be2892e52e8d 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 ca35dae5827c..ca35dae5827c 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 519cae03c5a5..519cae03c5a5 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 8cea90b6758d..8cea90b6758d 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 f423bd7ea1c4..f423bd7ea1c4 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 10d3a47cc85e..10d3a47cc85e 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 f53a649cd771..f53a649cd771 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 c8f380739a6a..c8f380739a6a 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 2ad91a3071ed..2ad91a3071ed 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 20777f990e26..20777f990e26 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 a25a2e890978..a25a2e890978 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 09108977c718..09108977c718 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 72fb8aa8e2ee..72fb8aa8e2ee 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 75de0e5cf38a..75de0e5cf38a 100644
--- a/pkgs/tools/text/bcat/gemset.nix
+++ b/nixpkgs/pkgs/tools/text/bcat/gemset.nix
diff --git a/pkgs/tools/text/catdoc/default.nix b/nixpkgs/pkgs/tools/text/catdoc/default.nix
index 8a8eb3117f03..8a8eb3117f03 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 adf9d17815b0..adf9d17815b0 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 9f6b7a7f1227..9f6b7a7f1227 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 56a8133bd3a8..56a8133bd3a8 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 2d1dad706340..2d1dad706340 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 46fdf29ad46c..46fdf29ad46c 100644
--- a/pkgs/tools/text/colordiff/default.nix
+++ b/nixpkgs/pkgs/tools/text/colordiff/default.nix
diff --git a/pkgs/tools/text/convertlit/default.nix b/nixpkgs/pkgs/tools/text/convertlit/default.nix
index ffc2dc1c4d5c..ffc2dc1c4d5c 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 604097fbe778..604097fbe778 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 f581e44bcc8a..f581e44bcc8a 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 7404c887a46b..7404c887a46b 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 cfb627d70428..cfb627d70428 100644
--- a/pkgs/tools/text/diction/default.nix
+++ b/nixpkgs/pkgs/tools/text/diction/default.nix
diff --git a/pkgs/tools/text/diffstat/default.nix b/nixpkgs/pkgs/tools/text/diffstat/default.nix
index fa5718ce4d36..fa5718ce4d36 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 67f397dbe48a..67f397dbe48a 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 561ee06136d8..561ee06136d8 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 045b369b4b69..045b369b4b69 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 dd0d1bbc9410..dd0d1bbc9410 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 7dcd94e5363f..7dcd94e5363f 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 098eee7cf720..098eee7cf720 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 24ac649026af..24ac649026af 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 3ad6f0d3eccc..3ad6f0d3eccc 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 b4418e04f03b..b4418e04f03b 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 efe126fe042d..efe126fe042d 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 f0947004b4b1..f0947004b4b1 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/nixpkgs/pkgs/tools/text/gawk/default.nix
diff --git a/pkgs/tools/text/gist/default.nix b/nixpkgs/pkgs/tools/text/gist/default.nix
index 7091031d28f0..7091031d28f0 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 d61a7d184ea4..d61a7d184ea4 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 702d1b4d89fa..702d1b4d89fa 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 22d5f061c332..22d5f061c332 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 2da323c69844..2da323c69844 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/default.nix b/nixpkgs/pkgs/tools/text/gnupatch/default.nix
index 1a5cda5799dc..1a5cda5799dc 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 3a9856c3dd37..3a9856c3dd37 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 8a44e434d4c1..8a44e434d4c1 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 837ec5b7a5ff..837ec5b7a5ff 100644
--- a/pkgs/tools/text/grin/default.nix
+++ b/nixpkgs/pkgs/tools/text/grin/default.nix
diff --git a/pkgs/tools/text/groff/default.nix b/nixpkgs/pkgs/tools/text/groff/default.nix
index 082c61635ba9..082c61635ba9 100644
--- a/pkgs/tools/text/groff/default.nix
+++ b/nixpkgs/pkgs/tools/text/groff/default.nix
diff --git a/pkgs/tools/text/groff/look-for-ar.patch b/nixpkgs/pkgs/tools/text/groff/look-for-ar.patch
index 3b4d09c260fa..3b4d09c260fa 100644
--- a/pkgs/tools/text/groff/look-for-ar.patch
+++ b/nixpkgs/pkgs/tools/text/groff/look-for-ar.patch
diff --git a/pkgs/tools/text/groff/mdate-determinism.patch b/nixpkgs/pkgs/tools/text/groff/mdate-determinism.patch
index 1253d1133940..1253d1133940 100644
--- a/pkgs/tools/text/groff/mdate-determinism.patch
+++ b/nixpkgs/pkgs/tools/text/groff/mdate-determinism.patch
diff --git a/pkgs/tools/text/groff/site.tmac b/nixpkgs/pkgs/tools/text/groff/site.tmac
index 8ef1040ca4a0..8ef1040ca4a0 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 69924bb234b5..69924bb234b5 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 a04a2c65e7c3..a04a2c65e7c3 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 8e2cc5af3bf1..8e2cc5af3bf1 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 26e09dd7efa3..26e09dd7efa3 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 1974c0aa4f36..1974c0aa4f36 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 194484755481..194484755481 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 70745266fe55..70745266fe55 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 48ee20eff179..48ee20eff179 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 aec238cb4ccc..aec238cb4ccc 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 646efbab5bf3..646efbab5bf3 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 dbec8d353d94..dbec8d353d94 100644
--- a/pkgs/tools/text/ispell/default.nix
+++ b/nixpkgs/pkgs/tools/text/ispell/default.nix
diff --git a/pkgs/tools/text/ispell/patches/0005-Do-not-reorder-words.patch b/nixpkgs/pkgs/tools/text/ispell/patches/0005-Do-not-reorder-words.patch
index 2d74c078601a..2d74c078601a 100644
--- a/pkgs/tools/text/ispell/patches/0005-Do-not-reorder-words.patch
+++ b/nixpkgs/pkgs/tools/text/ispell/patches/0005-Do-not-reorder-words.patch
diff --git a/pkgs/tools/text/ispell/patches/0007-Use-termios.patch b/nixpkgs/pkgs/tools/text/ispell/patches/0007-Use-termios.patch
index 299e3c01ab13..299e3c01ab13 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 21b44d505db0..21b44d505db0 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 dbe0db9a0533..dbe0db9a0533 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 5e77b6a4f371..5e77b6a4f371 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 ea966d67792e..ea966d67792e 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 9c0aedb67d76..9c0aedb67d76 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 8902018dab58..8902018dab58 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 392d94d27d33..392d94d27d33 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 fd35ee34ec16..fd35ee34ec16 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 ffa114d28a12..ffa114d28a12 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 bf687f04413c..bf687f04413c 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 46d290b79ffb..46d290b79ffb 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 5eea33d13a47..5eea33d13a47 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 626455732599..626455732599 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 aa53aeb42061..aa53aeb42061 100644
--- a/pkgs/tools/text/kdiff3/default.nix
+++ b/nixpkgs/pkgs/tools/text/kdiff3/default.nix
diff --git a/pkgs/tools/text/kytea/default.nix b/nixpkgs/pkgs/tools/text/kytea/default.nix
index eb537c67a631..eb537c67a631 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 71b1d0c3b16e..71b1d0c3b16e 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 1ccba80cb3e6..1ccba80cb3e6 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 32aeed7499f3..32aeed7499f3 100644
--- a/pkgs/tools/text/link-grammar/default.nix
+++ b/nixpkgs/pkgs/tools/text/link-grammar/default.nix
diff --git a/pkgs/tools/text/mairix/default.nix b/nixpkgs/pkgs/tools/text/mairix/default.nix
index e72824db6273..e72824db6273 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 241083f2dde5..241083f2dde5 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 f479c221b65f..f479c221b65f 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 9fed14c6d550..9fed14c6d550 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 ddc7f96ec26e..ddc7f96ec26e 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 6e1faa3331f0..6e1faa3331f0 100644
--- a/pkgs/tools/text/mdbook/default.nix
+++ b/nixpkgs/pkgs/tools/text/mdbook/default.nix
diff --git a/pkgs/tools/text/mecab/base.nix b/nixpkgs/pkgs/tools/text/mecab/base.nix
index 7509f3e9c483..7509f3e9c483 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 0b7e7e86df1b..0b7e7e86df1b 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 9896b365a6a2..9896b365a6a2 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 1cbc31be4ee1..1cbc31be4ee1 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 3e0bee3b9b98..3e0bee3b9b98 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 4e3be9e17e0c..4e3be9e17e0c 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 6665b377ccf5..6665b377ccf5 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 d4b4902303b6..d4b4902303b6 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 ae4ece899a4c..ae4ece899a4c 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 4470511f6163..4470511f6163 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 8b2032dcaba5..8b2032dcaba5 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 9b214e6b5027..9b214e6b5027 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 ca65c567c661..ca65c567c661 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 59cfc86efbf3..59cfc86efbf3 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 a746c4544350..a746c4544350 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 8a314d448439..8a314d448439 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 1320f824fdf3..1320f824fdf3 100644
--- a/pkgs/tools/text/numdiff/default.nix
+++ b/nixpkgs/pkgs/tools/text/numdiff/default.nix
diff --git a/pkgs/tools/text/odt2txt/default.nix b/nixpkgs/pkgs/tools/text/odt2txt/default.nix
index 48abee018306..48abee018306 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 a2a02049d267..a2a02049d267 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 199cd1422aaa..199cd1422aaa 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 0d1b2a6fbe6d..0d1b2a6fbe6d 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 a02ca1cd3dde..a02ca1cd3dde 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 91bfe3198963..91bfe3198963 100644
--- a/pkgs/tools/text/papertrail/gemset.nix
+++ b/nixpkgs/pkgs/tools/text/papertrail/gemset.nix
diff --git a/pkgs/tools/text/papertrail/shell.nix b/nixpkgs/pkgs/tools/text/papertrail/shell.nix
index 55a7a18f57b1..55a7a18f57b1 100644
--- a/pkgs/tools/text/papertrail/shell.nix
+++ b/nixpkgs/pkgs/tools/text/papertrail/shell.nix
diff --git a/pkgs/tools/text/par/default.nix b/nixpkgs/pkgs/tools/text/par/default.nix
index 5f9ca5212d30..5f9ca5212d30 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 b324137be6aa..b324137be6aa 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 eab0e98f95c7..eab0e98f95c7 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 e02693a5683d..e02693a5683d 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 87d925e333f6..87d925e333f6 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 b51f811644d1..b51f811644d1 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 29bae2de5b51..29bae2de5b51 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 4b30387f7ac5..4b30387f7ac5 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 04fb9bd4be34..04fb9bd4be34 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 ccfeabaa73bd..ccfeabaa73bd 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 a5864fbc051c..a5864fbc051c 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 5e76e3541733..5e76e3541733 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 c536cbbaaad4..c536cbbaaad4 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 5f0e7461361d..5f0e7461361d 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 8f998e3a26d2..8f998e3a26d2 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 e3970c059027..e3970c059027 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 f708ddd93664..f708ddd93664 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 0ede7e2a2564..0ede7e2a2564 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 b97ffc7c58a8..b97ffc7c58a8 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 e1e4a43188df..e1e4a43188df 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 9edbaff99295..9edbaff99295 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 9242014cdca5..9242014cdca5 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 1ee95c4bae18..1ee95c4bae18 100644
--- a/pkgs/tools/text/replace/malloc.patch
+++ b/nixpkgs/pkgs/tools/text/replace/malloc.patch
diff --git a/pkgs/tools/text/ripgrep/default.nix b/nixpkgs/pkgs/tools/text/ripgrep/default.nix
index 1563fe744ef0..1563fe744ef0 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 bdbc97124433..bdbc97124433 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 8aadbb0b8062..8aadbb0b8062 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 4bb5d8c175d7..4bb5d8c175d7 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 820a972d106d..820a972d106d 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 b939e1500e49..b939e1500e49 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 f4c637aadf88..f4c637aadf88 100644
--- a/pkgs/tools/text/ruby-zoom/gemset.nix
+++ b/nixpkgs/pkgs/tools/text/ruby-zoom/gemset.nix
diff --git a/pkgs/tools/text/schema2ldif/default.nix b/nixpkgs/pkgs/tools/text/schema2ldif/default.nix
index 2df6cbb27a2d..2df6cbb27a2d 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 3b4a6edba0ff..3b4a6edba0ff 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 b7f8bd6df381..b7f8bd6df381 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 cf3b2bad6c99..cf3b2bad6c99 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 d59573fa49cf..d59573fa49cf 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 ade640dac7a9..ade640dac7a9 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 753a3ea64287..753a3ea64287 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 73323c784fd7..73323c784fd7 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 12b57cb82dfd..12b57cb82dfd 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 97c677a7f701..97c677a7f701 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 421715f7c33c..421715f7c33c 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 038555fa3cab..038555fa3cab 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 30e8c72389b7..30e8c72389b7 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 72dfa684160b..72dfa684160b 100644
--- a/pkgs/tools/text/silver-searcher/default.nix
+++ b/nixpkgs/pkgs/tools/text/silver-searcher/default.nix
diff --git a/pkgs/tools/text/source-highlight/default.nix b/nixpkgs/pkgs/tools/text/source-highlight/default.nix
index d1858d6508d6..d1858d6508d6 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 f88ac6951bfc..f88ac6951bfc 100644
--- a/pkgs/tools/text/staccato/default.nix
+++ b/nixpkgs/pkgs/tools/text/staccato/default.nix
diff --git a/pkgs/tools/text/transifex-client/default.nix b/nixpkgs/pkgs/tools/text/transifex-client/default.nix
index 9a11b5fba57a..9a11b5fba57a 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 592f9b8f1885..592f9b8f1885 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 ccf17695f6cd..ccf17695f6cd 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 879f903ade97..879f903ade97 100644
--- a/pkgs/tools/text/unoconv/default.nix
+++ b/nixpkgs/pkgs/tools/text/unoconv/default.nix
diff --git a/pkgs/tools/text/unoconv/unoconv-python3.patch b/nixpkgs/pkgs/tools/text/unoconv/unoconv-python3.patch
index 2c6e9c719411..2c6e9c719411 100644
--- a/pkgs/tools/text/unoconv/unoconv-python3.patch
+++ b/nixpkgs/pkgs/tools/text/unoconv/unoconv-python3.patch
diff --git a/pkgs/tools/text/unrtf/default.nix b/nixpkgs/pkgs/tools/text/unrtf/default.nix
index 361b6782526b..361b6782526b 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 b1671ad38b53..b1671ad38b53 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 3e436b80be8a..3e436b80be8a 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 001ed1addaad..001ed1addaad 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 20cd5066e808..20cd5066e808 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 66dfa1c6b348..66dfa1c6b348 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 9d476cec2ca1..9d476cec2ca1 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 0650270bb6a0..0650270bb6a0 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 8851b8a2725c..8851b8a2725c 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 f764a2fac07d..f764a2fac07d 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 fef8b9db2ffd..fef8b9db2ffd 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 fc11e210c3cc..fc11e210c3cc 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/sablotron/default.nix b/nixpkgs/pkgs/tools/text/xml/sablotron/default.nix
index 131bf3ae68c1..131bf3ae68c1 100644
--- a/pkgs/tools/text/xml/sablotron/default.nix
+++ b/nixpkgs/pkgs/tools/text/xml/sablotron/default.nix
diff --git a/pkgs/tools/text/xml/xml2/default.nix b/nixpkgs/pkgs/tools/text/xml/xml2/default.nix
index 40013c7f46d5..40013c7f46d5 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 5982aa3828ef..5982aa3828ef 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 9703bd1ecea5..9703bd1ecea5 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 4fe6ad6b3dc9..4fe6ad6b3dc9 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 b35053d362bb..b35053d362bb 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 479085be0e1d..479085be0e1d 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 55619b416320..55619b416320 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 00673341cfc6..00673341cfc6 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 fbd9bc3fa20a..fbd9bc3fa20a 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 c9a6b7b3d795..c9a6b7b3d795 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 ac4de4eee144..ac4de4eee144 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 d18a5e2c7442..d18a5e2c7442 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 f9329a80a815..f9329a80a815 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 02081e117d6e..02081e117d6e 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 2f1c7e461545..2f1c7e461545 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 02700962eb28..02700962eb28 100644
--- a/pkgs/tools/typesetting/asciidoctor/gemset.nix
+++ b/nixpkgs/pkgs/tools/typesetting/asciidoctor/gemset.nix
diff --git a/pkgs/tools/typesetting/asciidoctor/update.sh b/nixpkgs/pkgs/tools/typesetting/asciidoctor/update.sh
index 1f7e5541ceec..1f7e5541ceec 100755
--- a/pkgs/tools/typesetting/asciidoctor/update.sh
+++ b/nixpkgs/pkgs/tools/typesetting/asciidoctor/update.sh
diff --git a/pkgs/tools/typesetting/biber/default.nix b/nixpkgs/pkgs/tools/typesetting/biber/default.nix
index 3f9ba73e13d9..3f9ba73e13d9 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 fd2cf133c0ac..fd2cf133c0ac 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 7200909660bd..7200909660bd 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 8daa5c87a661..8daa5c87a661 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 5309e4555b49..5309e4555b49 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 9240926ab5b4..9240926ab5b4 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 a255779c08a3..a255779c08a3 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 243bd90f9005..243bd90f9005 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 f0ed44351a20..f0ed44351a20 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 aa32d52dfc6d..aa32d52dfc6d 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 d6c4fedc1434..d6c4fedc1434 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 fc43ed0abe27..fc43ed0abe27 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 61459e48b7f0..61459e48b7f0 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 85c0bacf3155..85c0bacf3155 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 2b7a6f3ffb44..2b7a6f3ffb44 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 47f964c6a477..47f964c6a477 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 3a7d7be006a1..3a7d7be006a1 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 c53e8573c90f..c53e8573c90f 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 42f984b8cc60..42f984b8cc60 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 8e1d9dfc1914..8e1d9dfc1914 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 ad9684910c0b..ad9684910c0b 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 3e40c9caf28e..3e40c9caf28e 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 1425aa5ae6a3..1425aa5ae6a3 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 38382689edce..38382689edce 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 31184e11399b..31184e11399b 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 72f25ef099bc..72f25ef099bc 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 25f12838be08..25f12838be08 100644
--- a/pkgs/tools/typesetting/psutils/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/psutils/default.nix
diff --git a/pkgs/tools/typesetting/pygmentex/default.nix b/nixpkgs/pkgs/tools/typesetting/pygmentex/default.nix
index 662f7717b33b..662f7717b33b 100644
--- a/pkgs/tools/typesetting/pygmentex/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/pygmentex/default.nix
diff --git a/pkgs/tools/typesetting/rubber/default.nix b/nixpkgs/pkgs/tools/typesetting/rubber/default.nix
index 21d83dd1dd06..21d83dd1dd06 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 0a0f593eaa3b..0a0f593eaa3b 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 f2a48e5db049..f2a48e5db049 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 966d657ae7d0..966d657ae7d0 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 355d7a055e8f..355d7a055e8f 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 1cb7b9ce9759..1cb7b9ce9759 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 a7886f317c15..a7886f317c15 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 b60cbcf22ad0..b60cbcf22ad0 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 5444914f7a4e..5444914f7a4e 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 c4eaf4e1df46..c4eaf4e1df46 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 6d64b536502e..6d64b536502e 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 db0ec6d9bead..db0ec6d9bead 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 f038b83ff7ad..f038b83ff7ad 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 2cec62fc7cb6..2cec62fc7cb6 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 4ee45bf4bc8f..4ee45bf4bc8f 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 71cf601dfac0..71cf601dfac0 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 dd8de4a23dbc..dd8de4a23dbc 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 41675e939f60..41675e939f60 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 2dc12aa517a7..2dc12aa517a7 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 bfef3df6b0e1..bfef3df6b0e1 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 3941fdcac4a4..3941fdcac4a4 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 9215a1e0ac48..9215a1e0ac48 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 56e50e444081..56e50e444081 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 0835c7c547df..0835c7c547df 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 fcdebedb7d87..fcdebedb7d87 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/tetex/clang.patch b/nixpkgs/pkgs/tools/typesetting/tex/tetex/clang.patch
index 50d83f624437..50d83f624437 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 ac317fd51dcb..ac317fd51dcb 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 6e652849b773..6e652849b773 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 f6c954fcfa5c..f6c954fcfa5c 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 c82c1b3ac360..c82c1b3ac360 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 5faef7fe5df5..5faef7fe5df5 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 67ea7c4fe185..67ea7c4fe185 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 5aab4c80d275..5aab4c80d275 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 69fde7784f59..69fde7784f59 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 23aca98ec81c..23aca98ec81c 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/fixHashes.sh b/nixpkgs/pkgs/tools/typesetting/tex/texlive/fixHashes.sh
index 439660682e2e..439660682e2e 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 b342e07eec10..b342e07eec10 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 b60bc8693e5b..b60bc8693e5b 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 5faef7fe5df5..5faef7fe5df5 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 97770cc812f9..97770cc812f9 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 8c29c8e76ae4..8c29c8e76ae4 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 906d9be0f1ec..906d9be0f1ec 100644
--- a/pkgs/tools/typesetting/tikzit/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/tikzit/default.nix
diff --git a/pkgs/tools/typesetting/xml2rfc/default.nix b/nixpkgs/pkgs/tools/typesetting/xml2rfc/default.nix
index 7fe0396ae440..7fe0396ae440 100644
--- a/pkgs/tools/typesetting/xml2rfc/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/xml2rfc/default.nix
diff --git a/pkgs/tools/typesetting/xmlroff/default.nix b/nixpkgs/pkgs/tools/typesetting/xmlroff/default.nix
index 523a34c0b569..523a34c0b569 100644
--- a/pkgs/tools/typesetting/xmlroff/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/xmlroff/default.nix
diff --git a/pkgs/tools/typesetting/xmlroff/xmlroff.patch b/nixpkgs/pkgs/tools/typesetting/xmlroff/xmlroff.patch
index 6f0246e96796..6f0246e96796 100644
--- a/pkgs/tools/typesetting/xmlroff/xmlroff.patch
+++ b/nixpkgs/pkgs/tools/typesetting/xmlroff/xmlroff.patch
diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/nixpkgs/pkgs/tools/typesetting/xmlto/default.nix
index b5b03b470cde..b5b03b470cde 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 f0ad4297c003..f0ad4297c003 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 4f5a348b144e..4f5a348b144e 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 ca2936003b84..ca2936003b84 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 752a6f314325..752a6f314325 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 037e07c72286..06830d1be636 100644
--- a/pkgs/tools/video/flvtool2/default.nix
+++ b/nixpkgs/pkgs/tools/video/flvtool2/default.nix
@@ -8,7 +8,6 @@ buildRubyGem rec {
   source.sha256 = "0xsla1061pi4ryh3jbvwsbs8qchprchbqjy7652g2g64v37i74qj";
 
   meta = {
-    broken = true; # depends on ruby 2.2
     homepage = https://github.com/unnu/flvtool2;
     description = "A tool to manipulate Macromedia Flash Video files";
     platforms = ruby.meta.platforms;
diff --git a/pkgs/tools/video/mjpegtools/default.nix b/nixpkgs/pkgs/tools/video/mjpegtools/default.nix
index 31d26a6c72a3..31d26a6c72a3 100644
--- a/pkgs/tools/video/mjpegtools/default.nix
+++ b/nixpkgs/pkgs/tools/video/mjpegtools/default.nix
diff --git a/pkgs/tools/video/rtmpdump/default.nix b/nixpkgs/pkgs/tools/video/rtmpdump/default.nix
index 8be028730377..8be028730377 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 3832f3c3be0c..3832f3c3be0c 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 a50c7539fe05..a50c7539fe05 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 c7eb89f9b3e0..c7eb89f9b3e0 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 c51c23d62f02..c51c23d62f02 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 561c8cf7d78f..561c8cf7d78f 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 411409495934..411409495934 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 e995f9e3a4f6..e995f9e3a4f6 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 f62fdd2f78fb..f62fdd2f78fb 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 37c3248b83e5..37c3248b83e5 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 618a45075c95..618a45075c95 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 fabdd5357743..fabdd5357743 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 00cb7d070c64..00cb7d070c64 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 178720436a6f..178720436a6f 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 577426712113..577426712113 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 1435fd2bde0e..1435fd2bde0e 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 54f1f492487d..54f1f492487d 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 e4c65946551d..e4c65946551d 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 674673f260ce..674673f260ce 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 54c2228911eb..54c2228911eb 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 86ad36886c9f..86ad36886c9f 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/euca2ools/default.nix b/nixpkgs/pkgs/tools/virtualization/euca2ools/default.nix
index 5b310992afb6..5b310992afb6 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 012090ba079d..012090ba079d 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 0db43ccfcfdd..0db43ccfcfdd 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 f2fdbcc670d9..f2fdbcc670d9 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 d7696be85e40..d7696be85e40 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 66618e59122a..66618e59122a 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 39efaab95358..39efaab95358 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 a2f4b1650876..a2f4b1650876 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 94a19c5375ea..94a19c5375ea 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 0fe8ab811a17..0fe8ab811a17 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 b5ceb522e230..b5ceb522e230 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 2699a7a1f36b..2699a7a1f36b 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 7d06b59b013c..7d06b59b013c 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 dfb1467b54d5..dfb1467b54d5 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 185f259ef708..185f259ef708 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/top-level/aliases.nix b/nixpkgs/pkgs/top-level/aliases.nix
index fd873605056b..fd873605056b 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 834dbc534e06..9dac708a153a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/nixpkgs/pkgs/top-level/all-packages.nix
@@ -2830,6 +2830,8 @@ in
 
   euca2ools = callPackage ../tools/virtualization/euca2ools { };
 
+  evscript = callPackage ../tools/inputmethods/evscript { };
+
   eventstat = callPackage ../os-specific/linux/eventstat { };
 
   evtest = callPackage ../applications/misc/evtest { };
@@ -3027,7 +3029,9 @@ in
 
   flamegraph = callPackage ../development/tools/flamegraph { };
 
-  flvtool2 = callPackage ../tools/video/flvtool2 { };
+  flvtool2 = callPackage ../tools/video/flvtool2 {
+    ruby = ruby_2_2;
+  };
 
   fmbt = callPackage ../development/tools/fmbt {
     python = python2;
@@ -6994,6 +6998,8 @@ in
 
   zsh-navigation-tools = callPackage ../tools/misc/zsh-navigation-tools { };
 
+  zsh-nix-shell = callPackage ../shells/zsh/zsh-nix-shell { };
+
   zsh-syntax-highlighting = callPackage ../shells/zsh/zsh-syntax-highlighting { };
 
   zsh-autosuggestions = callPackage ../shells/zsh/zsh-autosuggestions { };
@@ -8641,6 +8647,10 @@ in
     inherit (darwin) libiconv libobjc libunwind;
     inherit (darwin.apple_sdk.frameworks) Foundation;
   })
+    ruby_1_9
+    ruby_2_0
+    ruby_2_1
+    ruby_2_2
     ruby_2_3
     ruby_2_4
     ruby_2_5
@@ -9634,7 +9644,9 @@ in
 
   rdocker = callPackage ../development/tools/rdocker { };
 
-  redis-dump = callPackage ../development/tools/redis-dump { };
+  redis-dump = callPackage ../development/tools/redis-dump {
+    ruby = ruby_2_0;
+  };
 
   redo = callPackage ../development/tools/build-managers/redo { };
 
@@ -14568,6 +14580,11 @@ in
 
   influxdb = callPackage ../servers/nosql/influxdb { };
 
+  mysql56 = callPackage ../servers/sql/mysql/5.6.x.nix {
+    inherit (darwin) cctools developer_cmds;
+    inherit (darwin.apple_sdk.frameworks) CoreServices;
+  };
+
   mysql57 = callPackage ../servers/sql/mysql/5.7.x.nix {
     inherit (darwin) cctools developer_cmds;
     inherit (darwin.apple_sdk.frameworks) CoreServices;
@@ -18022,23 +18039,24 @@ in
 
   filezilla = callPackage ../applications/networking/ftp/filezilla { };
 
-  firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix {
-    callPackage = pkgs.newScope {
-      inherit (gnome2) libIDL;
-      libpng = libpng_apng;
-      python = python2;
-      gnused = gnused_422;
-      icu = icu63;
-      inherit (darwin.apple_sdk.frameworks) CoreMedia ExceptionHandling
-                                            Kerberos AVFoundation MediaToolbox
-                                            CoreLocation Foundation AddressBook;
-      inherit (darwin) libobjc;
-    };
-  });
+  firefoxCommon = args: callPackage (import ../applications/networking/browsers/firefox/common.nix args) {
+    inherit (gnome2) libIDL;
+    libpng = libpng_apng;
+    gnused = gnused_422;
+    icu = icu63;
+    inherit (darwin.apple_sdk.frameworks) CoreMedia ExceptionHandling
+                                          Kerberos AVFoundation MediaToolbox
+                                          CoreLocation Foundation AddressBook;
+    inherit (darwin) libobjc;
+  };
+
+  firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix { });
 
   firefox-unwrapped = firefoxPackages.firefox;
   firefox-esr-52-unwrapped = firefoxPackages.firefox-esr-52;
   firefox-esr-60-unwrapped = firefoxPackages.firefox-esr-60;
+  firefox-esr-unwrapped = firefox-esr-60-unwrapped;
+  firefox-beta-unwrapped = firefoxPackages.firefox-beta;
   tor-browser-unwrapped = firefoxPackages.tor-browser;
   icecat-unwrapped = firefoxPackages.icecat;
 
@@ -18047,6 +18065,8 @@ in
   firefox-esr-52 = wrapFirefox firefox-esr-52-unwrapped { };
   firefox-esr-60 = wrapFirefox firefox-esr-60-unwrapped { };
   firefox-esr = firefox-esr-60;
+  firefox-beta = wrapFirefox firefox-beta-unwrapped { };
+
   icecat = wrapFirefox icecat-unwrapped { };
 
   firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {
@@ -19580,6 +19600,8 @@ in
 
   opusTools = callPackage ../applications/audio/opus-tools { };
 
+  orca-c-100r = callPackage ../applications/audio/orca-c { };
+
   orpie = callPackage ../applications/misc/orpie {
     gsl = gsl_1;
     ocamlPackages = ocaml-ng.ocamlPackages_4_02;
@@ -20673,7 +20695,7 @@ in
 
   vimiv = callPackage ../applications/graphics/vimiv { };
 
-  macvim = callPackage ../applications/editors/vim/macvim.nix { stdenv = clangStdenv; };
+  macvim = callPackage ../applications/editors/vim/macvim.nix { stdenv = clangStdenv; ruby = ruby_2_2; };
 
   vimHugeX = vim_configurable;
 
diff --git a/pkgs/top-level/beam-packages.nix b/nixpkgs/pkgs/top-level/beam-packages.nix
index b1749b93ff0b..b1749b93ff0b 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 7a5b4bdd1798..7a5b4bdd1798 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 8a987c6cf143..8a987c6cf143 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 1753ac9dc7a6..1753ac9dc7a6 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 904ef8d39796..904ef8d39796 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 1740b3278097..1740b3278097 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 89698263f3de..89698263f3de 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 5b5b32b89da5..5b5b32b89da5 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 86e8228f1870..86e8228f1870 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 35b0b42da3fe..35b0b42da3fe 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 3ba6c08a140b..3ba6c08a140b 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 73ed6bf9162c..73ed6bf9162c 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 87c9bd3bacfb..87c9bd3bacfb 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 6f30bd06a81c..6f30bd06a81c 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 244b0ce7a664..244b0ce7a664 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 3b807c932f0a..3b807c932f0a 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 3db604b9e325..3db604b9e325 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 080754b4b1ff..080754b4b1ff 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 a16008880328..a16008880328 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 f82f7c04b5ba..f82f7c04b5ba 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 bc822b466c90..bc822b466c90 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 7e7cac95b9c5..7e7cac95b9c5 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 8b7240e21a33..8b7240e21a33 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 17239c6d879b..17239c6d879b 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 3437f620c74a..3437f620c74a 100644
--- a/pkgs/top-level/release.nix
+++ b/nixpkgs/pkgs/top-level/release.nix
diff --git a/pkgs/top-level/splice.nix b/nixpkgs/pkgs/top-level/splice.nix
index a093442d3698..a093442d3698 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 9f4b63293ef6..9f4b63293ef6 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 476ad9de3e95..476ad9de3e95 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 56bab2fe4116..56bab2fe4116 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 2c47a362c9a1..2c47a362c9a1 100644
--- a/pkgs/top-level/wine-packages.nix
+++ b/nixpkgs/pkgs/top-level/wine-packages.nix
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
deleted file mode 100644
index 762a61b8a579..000000000000
--- a/pkgs/build-support/rust/default.nix
+++ /dev/null
@@ -1,150 +0,0 @@
-{ stdenv, cacert, git, cargo, rustc, fetchcargo, buildPackages }:
-
-{ name ? "${args.pname}-${args.version}"
-, cargoSha256 ? "unset"
-, src ? null
-, srcs ? null
-, cargoPatches ? []
-, patches ? []
-, sourceRoot ? null
-, logLevel ? ""
-, buildInputs ? []
-, nativeBuildInputs ? []
-, cargoUpdateHook ? ""
-, cargoDepsHook ? ""
-, cargoBuildFlags ? []
-, buildType ? "release"
-
-, cargoVendorDir ? null
-, ... } @ args:
-
-assert cargoVendorDir == null -> cargoSha256 != "unset";
-assert buildType == "release" || buildType == "debug";
-
-let
-  cargoDeps = if cargoVendorDir == null
-    then fetchcargo {
-        inherit name src srcs sourceRoot cargoUpdateHook;
-        patches = cargoPatches;
-        sha256 = cargoSha256;
-      }
-    else null;
-
-  setupVendorDir = if cargoVendorDir == null
-    then ''
-      unpackFile "$cargoDeps"
-      cargoDepsCopy=$(stripHash $(basename $cargoDeps))
-      chmod -R +w "$cargoDepsCopy"
-    ''
-    else ''
-      cargoDepsCopy="$sourceRoot/${cargoVendorDir}"
-    '';
-
-  ccForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc";
-  cxxForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++";
-  ccForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc";
-  cxxForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++";
-  releaseDir = "target/${stdenv.hostPlatform.config}/${buildType}";
-
-in stdenv.mkDerivation (args // {
-  inherit cargoDeps;
-
-  patchRegistryDeps = ./patch-registry-deps;
-
-  nativeBuildInputs = [ cargo rustc git cacert ] ++ nativeBuildInputs;
-  inherit buildInputs;
-
-  patches = cargoPatches ++ patches;
-
-  PKG_CONFIG_ALLOW_CROSS =
-    if stdenv.buildPlatform != stdenv.hostPlatform then 1 else 0;
-
-  postUnpack = ''
-    eval "$cargoDepsHook"
-
-    ${setupVendorDir}
-
-    mkdir .cargo
-    config="$(pwd)/$cargoDepsCopy/.cargo/config";
-    if [[ ! -e $config ]]; then
-      config=${./fetchcargo-default-config.toml};
-    fi;
-    substitute $config .cargo/config \
-      --subst-var-by vendor "$(pwd)/$cargoDepsCopy"
-
-    unset cargoDepsCopy
-
-    export RUST_LOG=${logLevel}
-  '' + (args.postUnpack or "");
-
-  configurePhase = args.configurePhase or ''
-    runHook preConfigure
-    mkdir -p .cargo
-    cat >> .cargo/config <<'EOF'
-    [target."${stdenv.buildPlatform.config}"]
-    "linker" = "${ccForBuild}"
-    ${stdenv.lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) ''
-    [target."${stdenv.hostPlatform.config}"]
-    "linker" = "${ccForHost}"
-    ''}
-    EOF
-    cat .cargo/config
-    runHook postConfigure
-  '';
-
-  buildPhase = with builtins; args.buildPhase or ''
-    runHook preBuild
-
-    (
-    set -x
-    env \
-      "CC_${stdenv.buildPlatform.config}"="${ccForBuild}" \
-      "CXX_${stdenv.buildPlatform.config}"="${cxxForBuild}" \
-      "CC_${stdenv.hostPlatform.config}"="${ccForHost}" \
-      "CXX_${stdenv.hostPlatform.config}"="${cxxForHost}" \
-      cargo build \
-        --${buildType} \
-        --target ${stdenv.hostPlatform.config} \
-        --frozen ${concatStringsSep " " cargoBuildFlags}
-    )
-
-    # rename the output dir to a architecture independent one
-    mapfile -t targets < <(find "$NIX_BUILD_TOP" -type d | grep '${releaseDir}$')
-    for target in "''${targets[@]}"; do
-      rm -rf "$target/../../${buildType}"
-      ln -srf "$target" "$target/../../"
-    done
-
-    runHook postBuild
-  '';
-
-  checkPhase = args.checkPhase or ''
-    runHook preCheck
-    echo "Running cargo test"
-    cargo test
-    runHook postCheck
-  '';
-
-  doCheck = args.doCheck or true;
-
-  inherit releaseDir;
-
-  installPhase = args.installPhase or ''
-    runHook preInstall
-    mkdir -p $out/bin $out/lib
-
-    find $releaseDir \
-      -maxdepth 1 \
-      -type f \
-      -executable ! \( -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \) \
-      -print0 | xargs -r -0 cp -t $out/bin
-    find $releaseDir \
-      -maxdepth 1 \
-      -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \
-      -print0 | xargs -r -0 cp -t $out/lib
-    rmdir --ignore-fail-on-non-empty $out/lib $out/bin
-    runHook postInstall
-  '';
-
-  passthru = { inherit cargoDeps; } // (args.passthru or {});
-})
diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
deleted file mode 100644
index f7fce315e8c1..000000000000
--- a/pkgs/data/fonts/iosevka/default.nix
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-  stdenv, lib,
-  fetchFromGitHub, fetchurl,
-  nodejs, ttfautohint-nox, otfcc,
-
-  # Custom font set options.
-  # See https://github.com/be5invis/Iosevka#build-your-own-style
-  design ? [], upright ? [], italic ? [], oblique ? [],
-  family ? null, weights ? [],
-  # Custom font set name. Required if any custom settings above.
-  set ? null
-}:
-
-assert (design != []) -> set != null;
-assert (upright != []) -> set != null;
-assert (italic != []) -> set != null;
-assert (oblique != []) -> set != null;
-assert (family != null) -> set != null;
-assert (weights != []) -> set != null;
-
-let
-  installPackageLock = import ./package-lock.nix { inherit fetchurl lib; };
-in
-
-let pname = if set != null then "iosevka-${set}" else "iosevka"; in
-
-let
-  version = "1.14.3";
-  name = "${pname}-${version}";
-  src = fetchFromGitHub {
-    owner = "be5invis";
-    repo ="Iosevka";
-    rev = "v${version}";
-    sha256 = "0ba8hwxi88bp2jb9xfhk95nnlv8ykl74cv62xr4ybzm3b8ahpwqf";
-  };
-in
-
-with lib;
-let unwords = concatStringsSep " "; in
-
-let
-  param = name: options:
-    if options != [] then "${name}='${unwords options}'" else null;
-  config = unwords (lib.filter (x: x != null) [
-    (param "design" design)
-    (param "upright" upright)
-    (param "italic" italic)
-    (param "oblique" oblique)
-    (if family != null then "family='${family}'" else null)
-    (param "weights" weights)
-  ]);
-  custom = design != [] || upright != [] || italic != [] || oblique != []
-    || family != null || weights != [];
-in
-
-stdenv.mkDerivation {
-  inherit name pname version src;
-
-  nativeBuildInputs = [ nodejs ttfautohint-nox otfcc ];
-
-  passAsFile = [ "installPackageLock" ];
-  installPackageLock = installPackageLock ./package-lock.json;
-
-  preConfigure = ''
-    HOME=$TMPDIR
-    source "$installPackageLockPath";
-    npm --offline rebuild
-  '';
-
-  configurePhase = ''
-    runHook preConfigure
-
-    ${optionalString custom ''make custom-config set=${set} ${config}''}
-
-    runHook postConfigure
-  '';
-
-  makeFlags = lib.optionals custom [ "custom" "set=${set}" ];
-
-  installPhase = ''
-    runHook preInstall
-
-    fontdir="$out/share/fonts/$pname"
-    install -d "$fontdir"
-    install "dist/$pname/ttf"/* "$fontdir"
-
-    runHook postInstall
-  '';
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://be5invis.github.io/Iosevka/;
-    downloadPage = "https://github.com/be5invis/Iosevka/releases";
-    description = ''
-      Slender monospace sans-serif and slab-serif typeface inspired by Pragmata
-      Pro, M+ and PF DIN Mono, designed to be the ideal font for programming.
-    '';
-    license = licenses.ofl;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ cstrahan jfrankenau ttuegel ];
-  };
-}
diff --git a/pkgs/data/fonts/iosevka/package-lock.json b/pkgs/data/fonts/iosevka/package-lock.json
deleted file mode 100644
index 54de11a1f422..000000000000
--- a/pkgs/data/fonts/iosevka/package-lock.json
+++ /dev/null
@@ -1,1025 +0,0 @@
-{
-  "name": "iosevka",
-  "version": "1.14.0",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "JSONStream": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz",
-      "integrity": "sha1-wQI3G27Dp887hHygDCC7D85Mbeo=",
-      "requires": {
-        "jsonparse": "1.3.1",
-        "through": "2.3.8"
-      }
-    },
-    "amdefine": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
-    },
-    "ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
-    },
-    "bezier-js": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/bezier-js/-/bezier-js-2.2.5.tgz",
-      "integrity": "sha512-HGh+GevPguxrAmnWF2/A+8c8FEatnKcE6WttpYWA5fn1CfpJz4reFbr11DuyFs2gwaIo9vF7aVXW2xg1iaqvyg=="
-    },
-    "builtin-modules": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8="
-    },
-    "camelcase": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
-    },
-    "caryll-shapeops": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/caryll-shapeops/-/caryll-shapeops-0.3.1.tgz",
-      "integrity": "sha512-3TdH6DZGL08S6qEvCZLNaOHyFvmzQts8m+TyYEvc6/PiI+XgX5mIag1/CKczIM8e2QtDr8JKW8foo4VNOM8/Og==",
-      "requires": {
-        "bezier-js": "2.2.5",
-        "clipper-lib": "1.0.0"
-      }
-    },
-    "child-process-promise": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/child-process-promise/-/child-process-promise-2.2.1.tgz",
-      "integrity": "sha1-RzChHvYQ+tRQuPIjx50x172tgHQ=",
-      "requires": {
-        "cross-spawn": "4.0.2",
-        "node-version": "1.1.0",
-        "promise-polyfill": "6.1.0"
-      }
-    },
-    "clipper-lib": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/clipper-lib/-/clipper-lib-1.0.0.tgz",
-      "integrity": "sha1-6QLOsm4o7lz6YBSr33kKUe//Tss="
-    },
-    "cliui": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-      "requires": {
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1",
-        "wrap-ansi": "2.1.0"
-      }
-    },
-    "clone": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz",
-      "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8="
-    },
-    "code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
-    },
-    "coffee-script": {
-      "version": "1.12.7",
-      "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz",
-      "integrity": "sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw=="
-    },
-    "cross-spawn": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
-      "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=",
-      "requires": {
-        "lru-cache": "4.1.1",
-        "which": "1.3.0"
-      }
-    },
-    "cubic2quad": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/cubic2quad/-/cubic2quad-1.1.1.tgz",
-      "integrity": "sha1-abGcYaP1tB7PLx1fro+wNBWqixU="
-    },
-    "decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
-    },
-    "deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
-    },
-    "defaults": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
-      "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
-      "requires": {
-        "clone": "1.0.3"
-      }
-    },
-    "error-ex": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
-      "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
-      "requires": {
-        "is-arrayish": "0.2.1"
-      }
-    },
-    "escodegen": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.0.tgz",
-      "integrity": "sha512-v0MYvNQ32bzwoG2OSFzWAkuahDQHK92JBN0pTAALJ4RIxEZe766QJPDR8Hqy7XNUy5K3fnVL76OqYAdc4TZEIw==",
-      "requires": {
-        "esprima": "3.1.3",
-        "estraverse": "4.2.0",
-        "esutils": "2.0.2",
-        "optionator": "0.8.2",
-        "source-map": "0.5.7"
-      }
-    },
-    "escope": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escope/-/escope-1.0.3.tgz",
-      "integrity": "sha1-dZ3OhJbEJI/sLQyq9BCLzz8af10=",
-      "requires": {
-        "estraverse": "2.0.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-2.0.0.tgz",
-          "integrity": "sha1-WuRpYyQ2ACBmdMyySgnhZnT83KE="
-        }
-      }
-    },
-    "esmangle": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/esmangle/-/esmangle-1.0.1.tgz",
-      "integrity": "sha1-2bs3uPjq+/Tm1O1reqKVarvTxMI=",
-      "requires": {
-        "escodegen": "1.3.3",
-        "escope": "1.0.3",
-        "esprima": "1.1.1",
-        "esshorten": "1.1.1",
-        "estraverse": "1.5.1",
-        "esutils": "1.0.0",
-        "optionator": "0.3.0",
-        "source-map": "0.1.43"
-      },
-      "dependencies": {
-        "escodegen": {
-          "version": "1.3.3",
-          "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz",
-          "integrity": "sha1-8CQBb1qI4Eb9EgBQVek5gC5sXyM=",
-          "requires": {
-            "esprima": "1.1.1",
-            "estraverse": "1.5.1",
-            "esutils": "1.0.0",
-            "source-map": "0.1.43"
-          }
-        },
-        "esprima": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz",
-          "integrity": "sha1-W28VR/TRAuZw4UDFCb5ncdautUk="
-        },
-        "estraverse": {
-          "version": "1.5.1",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz",
-          "integrity": "sha1-hno+jlip+EYYr7bC3bzZFrfLr3E="
-        },
-        "esutils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz",
-          "integrity": "sha1-gVHTWOIMisx/t0XnRywAJf5JZXA="
-        },
-        "fast-levenshtein": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz",
-          "integrity": "sha1-AXjc3uAjuSkFGTrwlZ6KdjnP3Lk="
-        },
-        "levn": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz",
-          "integrity": "sha1-uo0znQykphDjo/FFucr0iAcVUFQ=",
-          "requires": {
-            "prelude-ls": "1.1.2",
-            "type-check": "0.3.2"
-          }
-        },
-        "optionator": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.3.0.tgz",
-          "integrity": "sha1-lxWotfXnWGz/BsgkngOc1zZNP1Q=",
-          "requires": {
-            "deep-is": "0.1.3",
-            "fast-levenshtein": "1.0.7",
-            "levn": "0.2.5",
-            "prelude-ls": "1.1.2",
-            "type-check": "0.3.2",
-            "wordwrap": "0.0.3"
-          }
-        },
-        "source-map": {
-          "version": "0.1.43",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-          "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
-          "requires": {
-            "amdefine": "1.0.1"
-          }
-        },
-        "wordwrap": {
-          "version": "0.0.3",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-          "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
-        }
-      }
-    },
-    "esprima": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-      "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM="
-    },
-    "esshorten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/esshorten/-/esshorten-1.1.1.tgz",
-      "integrity": "sha1-F0+Wt8wmfkaHLYFOfbfCkL3/Yak=",
-      "requires": {
-        "escope": "1.0.3",
-        "estraverse": "4.1.1",
-        "esutils": "2.0.2"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.1.1.tgz",
-          "integrity": "sha1-9srKcokzqFDvkGYdDheYK6RxEaI="
-        }
-      }
-    },
-    "estraverse": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM="
-    },
-    "esutils": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs="
-    },
-    "execa": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-      "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-      "requires": {
-        "cross-spawn": "5.1.0",
-        "get-stream": "3.0.0",
-        "is-stream": "1.1.0",
-        "npm-run-path": "2.0.2",
-        "p-finally": "1.0.0",
-        "signal-exit": "3.0.2",
-        "strip-eof": "1.0.0"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-          "requires": {
-            "lru-cache": "4.1.1",
-            "shebang-command": "1.2.0",
-            "which": "1.3.0"
-          }
-        }
-      }
-    },
-    "fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
-    },
-    "find-up": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-      "requires": {
-        "path-exists": "2.1.0",
-        "pinkie-promise": "2.0.1"
-      }
-    },
-    "fs-extra": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
-      "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
-      "requires": {
-        "graceful-fs": "4.1.11",
-        "jsonfile": "3.0.1",
-        "universalify": "0.1.1"
-      }
-    },
-    "get-caller-file": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz",
-      "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U="
-    },
-    "get-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
-    },
-    "graceful-fs": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
-    },
-    "hosted-git-info": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
-      "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg=="
-    },
-    "invert-kv": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
-    },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
-    },
-    "is-builtin-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
-      "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
-      "requires": {
-        "builtin-modules": "1.1.1"
-      }
-    },
-    "is-fullwidth-code-point": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "requires": {
-        "number-is-nan": "1.0.1"
-      }
-    },
-    "is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
-    },
-    "is-utf8": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
-    },
-    "jsonfile": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
-      "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
-      "requires": {
-        "graceful-fs": "4.1.11"
-      }
-    },
-    "jsonparse": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-      "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA="
-    },
-    "lcid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-      "requires": {
-        "invert-kv": "1.0.0"
-      }
-    },
-    "levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-      "requires": {
-        "prelude-ls": "1.1.2",
-        "type-check": "0.3.2"
-      }
-    },
-    "libspiro-js": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/libspiro-js/-/libspiro-js-0.3.1.tgz",
-      "integrity": "sha1-hmUrAAmm2E6nmlMgvcpfAGEu5Dk="
-    },
-    "load-json-file": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-      "requires": {
-        "graceful-fs": "4.1.11",
-        "parse-json": "2.2.0",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1",
-        "strip-bom": "2.0.0"
-      }
-    },
-    "locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-      "requires": {
-        "p-locate": "2.0.0",
-        "path-exists": "3.0.0"
-      },
-      "dependencies": {
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
-        }
-      }
-    },
-    "lru-cache": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
-      "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==",
-      "requires": {
-        "pseudomap": "1.0.2",
-        "yallist": "2.1.2"
-      }
-    },
-    "megaminx": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/megaminx/-/megaminx-0.3.3.tgz",
-      "integrity": "sha512-lZBSLMro+XYJIix9zCZ8N6nZgixpjUPkX6CKuh+Y9Wl9bir/2Fp27NWapA0cNQCPrzOOI9sAwxc4BI14aIdumw==",
-      "requires": {
-        "JSONStream": "1.3.2",
-        "child-process-promise": "2.2.1",
-        "cubic2quad": "1.1.1",
-        "fs-extra": "3.0.1",
-        "which": "1.3.0"
-      }
-    },
-    "mem": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
-      "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
-      "requires": {
-        "mimic-fn": "1.2.0"
-      }
-    },
-    "mimic-fn": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
-    },
-    "node-version": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/node-version/-/node-version-1.1.0.tgz",
-      "integrity": "sha512-t1V2RFiaTavaW3jtQO0A2nok6k7/Gghuvx2rjvICuT0B0dYaObBQ4U0xHL+ZTPFZodt1LMYG2Vi2nypfz4/AJg=="
-    },
-    "normalize-package-data": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-      "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
-      "requires": {
-        "hosted-git-info": "2.5.0",
-        "is-builtin-module": "1.0.0",
-        "semver": "5.5.0",
-        "validate-npm-package-license": "3.0.1"
-      }
-    },
-    "npm-run-path": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-      "requires": {
-        "path-key": "2.0.1"
-      }
-    },
-    "number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
-    },
-    "optionator": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
-      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
-      "requires": {
-        "deep-is": "0.1.3",
-        "fast-levenshtein": "2.0.6",
-        "levn": "0.3.0",
-        "prelude-ls": "1.1.2",
-        "type-check": "0.3.2",
-        "wordwrap": "1.0.0"
-      }
-    },
-    "os-locale": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-      "requires": {
-        "lcid": "1.0.0"
-      }
-    },
-    "p-finally": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
-    },
-    "p-limit": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz",
-      "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==",
-      "requires": {
-        "p-try": "1.0.0"
-      }
-    },
-    "p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-      "requires": {
-        "p-limit": "1.2.0"
-      }
-    },
-    "p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
-    },
-    "pad": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/pad/-/pad-1.2.1.tgz",
-      "integrity": "sha512-cx/l/K+9UjGXJmoYolvP0l3cEUyB9BUdUL3wj3uwskIiApboLsinvsXxU9nSNg9Luz2ZyH0zzJNbqgLSNtfIDw==",
-      "requires": {
-        "coffee-script": "1.12.7",
-        "wcwidth": "1.0.1"
-      }
-    },
-    "parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-      "requires": {
-        "error-ex": "1.3.1"
-      }
-    },
-    "patel": {
-      "version": "0.32.1",
-      "resolved": "https://registry.npmjs.org/patel/-/patel-0.32.1.tgz",
-      "integrity": "sha1-nnC2sj/XqcgsV57VkbivpSF+YhI=",
-      "requires": {
-        "escodegen": "1.9.0",
-        "esmangle": "1.0.1",
-        "patrisika": "0.21.0",
-        "resumer": "0.0.0",
-        "yargs": "6.6.0"
-      },
-      "dependencies": {
-        "yargs": {
-          "version": "6.6.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz",
-          "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=",
-          "requires": {
-            "camelcase": "3.0.0",
-            "cliui": "3.2.0",
-            "decamelize": "1.2.0",
-            "get-caller-file": "1.0.2",
-            "os-locale": "1.4.0",
-            "read-pkg-up": "1.0.1",
-            "require-directory": "2.1.1",
-            "require-main-filename": "1.0.1",
-            "set-blocking": "2.0.0",
-            "string-width": "1.0.2",
-            "which-module": "1.0.0",
-            "y18n": "3.2.1",
-            "yargs-parser": "4.2.1"
-          }
-        }
-      }
-    },
-    "path-exists": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-      "requires": {
-        "pinkie-promise": "2.0.1"
-      }
-    },
-    "path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
-    },
-    "path-type": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-      "requires": {
-        "graceful-fs": "4.1.11",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1"
-      }
-    },
-    "patrisika": {
-      "version": "0.21.0",
-      "resolved": "https://registry.npmjs.org/patrisika/-/patrisika-0.21.0.tgz",
-      "integrity": "sha1-uCwn99QEFSLcXDG0O3xu+xnkdII=",
-      "requires": {
-        "patrisika-scopes": "0.11.0"
-      }
-    },
-    "patrisika-scopes": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/patrisika-scopes/-/patrisika-scopes-0.11.0.tgz",
-      "integrity": "sha1-BSqddkoWXgs0zDW2ViqIJCA2tAM="
-    },
-    "pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
-    },
-    "pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
-    },
-    "pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "requires": {
-        "pinkie": "2.0.4"
-      }
-    },
-    "prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
-    },
-    "promise-polyfill": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.1.0.tgz",
-      "integrity": "sha1-36lpQ+qcEh/KTem1hoyznTRy4Fc="
-    },
-    "pseudomap": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
-    },
-    "read-pkg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-      "requires": {
-        "load-json-file": "1.1.0",
-        "normalize-package-data": "2.4.0",
-        "path-type": "1.1.0"
-      }
-    },
-    "read-pkg-up": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-      "requires": {
-        "find-up": "1.1.2",
-        "read-pkg": "1.1.0"
-      }
-    },
-    "require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
-    },
-    "require-main-filename": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
-    },
-    "resumer": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz",
-      "integrity": "sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k=",
-      "requires": {
-        "through": "2.3.8"
-      }
-    },
-    "semver": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
-      "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="
-    },
-    "set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
-    },
-    "shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-      "requires": {
-        "shebang-regex": "1.0.0"
-      }
-    },
-    "shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
-    },
-    "signal-exit": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
-    },
-    "source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "optional": true
-    },
-    "spdx-correct": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
-      "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=",
-      "requires": {
-        "spdx-license-ids": "1.2.2"
-      }
-    },
-    "spdx-expression-parse": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz",
-      "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw="
-    },
-    "spdx-license-ids": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz",
-      "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc="
-    },
-    "string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-      "requires": {
-        "code-point-at": "1.1.0",
-        "is-fullwidth-code-point": "1.0.0",
-        "strip-ansi": "3.0.1"
-      }
-    },
-    "strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "requires": {
-        "ansi-regex": "2.1.1"
-      }
-    },
-    "strip-bom": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-      "requires": {
-        "is-utf8": "0.2.1"
-      }
-    },
-    "strip-eof": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
-    },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
-    },
-    "toml": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/toml/-/toml-2.3.3.tgz",
-      "integrity": "sha512-O7L5hhSQHxuufWUdcTRPfuTh3phKfAZ/dqfxZFoxPCj2RYmpaSGLEIs016FCXItQwNr08yefUB5TSjzRYnajTA=="
-    },
-    "topsort": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/topsort/-/topsort-0.0.2.tgz",
-      "integrity": "sha1-Ll4O6KFDlBfxAdW5stA15iAmMyE="
-    },
-    "type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "requires": {
-        "prelude-ls": "1.1.2"
-      }
-    },
-    "universalify": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
-      "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc="
-    },
-    "unorm": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz",
-      "integrity": "sha1-NkIA1fE2RsqLzURJAnEzVhR5IwA="
-    },
-    "validate-npm-package-license": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
-      "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=",
-      "requires": {
-        "spdx-correct": "1.0.2",
-        "spdx-expression-parse": "1.0.4"
-      }
-    },
-    "wcwidth": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
-      "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
-      "requires": {
-        "defaults": "1.0.3"
-      }
-    },
-    "which": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
-      "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
-      "requires": {
-        "isexe": "2.0.0"
-      }
-    },
-    "which-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8="
-    },
-    "wordwrap": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus="
-    },
-    "wrap-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-      "requires": {
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1"
-      }
-    },
-    "y18n": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE="
-    },
-    "yallist": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
-    },
-    "yargs": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
-      "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
-      "requires": {
-        "camelcase": "4.1.0",
-        "cliui": "3.2.0",
-        "decamelize": "1.2.0",
-        "get-caller-file": "1.0.2",
-        "os-locale": "2.1.0",
-        "read-pkg-up": "2.0.0",
-        "require-directory": "2.1.1",
-        "require-main-filename": "1.0.1",
-        "set-blocking": "2.0.0",
-        "string-width": "2.1.1",
-        "which-module": "2.0.0",
-        "y18n": "3.2.1",
-        "yargs-parser": "7.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
-        },
-        "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
-        },
-        "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-          "requires": {
-            "locate-path": "2.0.0"
-          }
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-        },
-        "load-json-file": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
-          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
-          "requires": {
-            "graceful-fs": "4.1.11",
-            "parse-json": "2.2.0",
-            "pify": "2.3.0",
-            "strip-bom": "3.0.0"
-          }
-        },
-        "os-locale": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
-          "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
-          "requires": {
-            "execa": "0.7.0",
-            "lcid": "1.0.0",
-            "mem": "1.1.0"
-          }
-        },
-        "path-type": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
-          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
-          "requires": {
-            "pify": "2.3.0"
-          }
-        },
-        "read-pkg": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
-          "requires": {
-            "load-json-file": "2.0.0",
-            "normalize-package-data": "2.4.0",
-            "path-type": "2.0.0"
-          }
-        },
-        "read-pkg-up": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
-          "requires": {
-            "find-up": "2.1.0",
-            "read-pkg": "2.0.0"
-          }
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "requires": {
-            "ansi-regex": "3.0.0"
-          }
-        },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
-        },
-        "which-module": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
-        },
-        "yargs-parser": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
-          "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
-          "requires": {
-            "camelcase": "4.1.0"
-          }
-        }
-      }
-    },
-    "yargs-parser": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz",
-      "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=",
-      "requires": {
-        "camelcase": "3.0.0"
-      }
-    }
-  }
-}
diff --git a/pkgs/data/fonts/iosevka/package-lock.nix b/pkgs/data/fonts/iosevka/package-lock.nix
deleted file mode 100644
index 4a7be92e7375..000000000000
--- a/pkgs/data/fonts/iosevka/package-lock.nix
+++ /dev/null
@@ -1,142 +0,0 @@
-{ lib, fetchurl }:
-
-with lib; with builtins;
-
-let
-  # Convert a base64-encoded string into a list of quads and padding.
-  fromBase64 = str:
-    let
-      len = stringLength str;
-      quads = 3 * len - 4 * padding;
-      padding =
-        if hasSuffix "==" str then 2 else
-        if hasSuffix "=" str then 1 else
-        0;
-      chars = stringToCharacters (substring 0 (len - padding) str);
-      table = {
-        "A" = [0 0 0];
-        "B" = [0 0 1];
-        "C" = [0 0 2];
-        "D" = [0 0 3];
-        "E" = [0 1 0];
-        "F" = [0 1 1];
-        "G" = [0 1 2];
-        "H" = [0 1 3];
-        "I" = [0 2 0];
-        "J" = [0 2 1];
-        "K" = [0 2 2];
-        "L" = [0 2 3];
-        "M" = [0 3 0];
-        "N" = [0 3 1];
-        "O" = [0 3 2];
-        "P" = [0 3 3];
-        "Q" = [1 0 0];
-        "R" = [1 0 1];
-        "S" = [1 0 2];
-        "T" = [1 0 3];
-        "U" = [1 1 0];
-        "V" = [1 1 1];
-        "W" = [1 1 2];
-        "X" = [1 1 3];
-        "Y" = [1 2 0];
-        "Z" = [1 2 1];
-        "a" = [1 2 2];
-        "b" = [1 2 3];
-        "c" = [1 3 0];
-        "d" = [1 3 1];
-        "e" = [1 3 2];
-        "f" = [1 3 3];
-        "g" = [2 0 0];
-        "h" = [2 0 1];
-        "i" = [2 0 2];
-        "j" = [2 0 3];
-        "k" = [2 1 0];
-        "l" = [2 1 1];
-        "m" = [2 1 2];
-        "n" = [2 1 3];
-        "o" = [2 2 0];
-        "p" = [2 2 1];
-        "q" = [2 2 2];
-        "r" = [2 2 3];
-        "s" = [2 3 0];
-        "t" = [2 3 1];
-        "u" = [2 3 2];
-        "v" = [2 3 3];
-        "w" = [3 0 0];
-        "x" = [3 0 1];
-        "y" = [3 0 2];
-        "z" = [3 0 3];
-        "0" = [3 1 0];
-        "1" = [3 1 1];
-        "2" = [3 1 2];
-        "3" = [3 1 3];
-        "4" = [3 2 0];
-        "5" = [3 2 1];
-        "6" = [3 2 2];
-        "7" = [3 2 3];
-        "8" = [3 3 0];
-        "9" = [3 3 1];
-        "+" = [3 3 2];
-        "/" = [3 3 3];
-      };
-    in
-      take quads (concatMap (c: table.${c}) chars);
-
-  # Convert a list of quads with padding into a base16-encoded string.
-  toBase16 = quads:
-    if length quads == 0 then "" else
-    if length quads == 1 then throw "toBase16: odd quads" else
-    let
-      hexad = 4 * elemAt quads 0 + elemAt quads 1;
-      hexits = "0123456789abcdef";
-    in
-      substring hexad 1 hexits + toBase16 (drop 2 quads);
-in
-
-let
-  fetchResolved = { resolved, integrity, ... }:
-    let args = { url = resolved; } // integrityHash integrity; in
-      fetchurl args;
-  integrityHash = integrity:
-    if hasPrefix "sha1-" integrity then integritySHA1 integrity else
-    if hasPrefix "sha512-" integrity then integritySHA512 integrity else
-    throw "don't understand integrity: ${integrity}";
-  integritySHA1 = integrity:
-    { sha1 = toBase16 (fromBase64 (removePrefix "sha1-" integrity)); };
-  integritySHA512 = integrity:
-    { sha512 = toBase16 (fromBase64 (removePrefix "sha512-" integrity)); };
-in
-
-let
-  depend = name: attrs@{ version, dependencies ? {}, ... }:
-      {
-        inherit name version;
-        src = fetchResolved attrs;
-        depends = mapAttrsToList depend dependencies;
-      };
-  prepareDepend = { name, src, depends, ... }:
-    ''
-      unpackFile '${src}'
-      mv package '${name}'
-      mkdir -p '${name}/node_modules'
-      (
-          cd '${name}/node_modules'
-          ${concatMapStrings prepareDepend depends}
-      )
-    '';
-in
-
-packageLockFile:
-
-let
-  packageLock = fromJSON (readFile packageLockFile);
-  depends = mapAttrsToList depend packageLock.dependencies;
-in
-  ''
-    mkdir -p node_modules
-    (
-        cd node_modules
-        ${concatMapStrings prepareDepend depends}
-    )
-  ''
-
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
deleted file mode 100644
index cd98aa1fa9a6..000000000000
--- a/pkgs/development/go-modules/generic/default.nix
+++ /dev/null
@@ -1,206 +0,0 @@
-{ go, cacert, git, lib, removeReferencesTo, stdenv }:
-
-{ name ? "${args'.pname}-${args'.version}"
-, src
-, buildInputs ? []
-, nativeBuildInputs ? []
-, passthru ? {}
-, patches ? []
-
-# modSha256 is the sha256 of the vendored dependencies
-, modSha256
-
-# We want parallel builds by default
-, enableParallelBuilding ? true
-
-# Disabled flag
-, disabled ? false
-
-# Do not enable this without good reason
-# IE: programs coupled with the compiler
-, allowGoReference ? false
-
-, meta ? {}
-
-, ... }@args':
-
-with builtins;
-
-let
-  args = removeAttrs args' [ "modSha256" "disabled" ];
-
-  removeReferences = [ ] ++ lib.optional (!allowGoReference) go;
-
-  removeExpr = refs: ''remove-references-to ${lib.concatMapStrings (ref: " -t ${ref}") refs}'';
-
-  go-modules = go.stdenv.mkDerivation {
-    name = "${name}-go-modules";
-
-    nativeBuildInputs = [ go git cacert ];
-
-    inherit (args) src;
-    inherit (go) GOOS GOARCH;
-
-    patches = args.patches or [];
-
-    GO111MODULE = "on";
-
-    impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
-      "GIT_PROXY_COMMAND" "SOCKS_SERVER"
-    ];
-
-    configurePhase = args.modConfigurePhase or ''
-      runHook preConfigure
-
-      export GOCACHE=$TMPDIR/go-cache
-      export GOPATH="$TMPDIR/go"
-      mkdir -p "''${GOPATH}/pkg/mod/cache/download"
-
-      runHook postConfigure
-    '';
-
-    buildPhase = args.modBuildPhase or ''
-      runHook preBuild
-
-      go mod download
-
-      runHook postBuild
-    '';
-
-    installPhase = args.modInstallPhase or ''
-      runHook preInstall
-
-      cp -r "''${GOPATH}/pkg/mod/cache/download" $out
-
-      runHook postInstall
-    '';
-
-    dontFixup = true;
-    outputHashMode = "recursive";
-    outputHashAlgo = "sha256";
-    outputHash = modSha256;
-  };
-
-  package = go.stdenv.mkDerivation (args // {
-    nativeBuildInputs = [ removeReferencesTo go ] ++ nativeBuildInputs;
-
-    inherit (go) GOOS GOARCH;
-
-    GO111MODULE = "on";
-
-    configurePhase = args.configurePhase or ''
-      runHook preConfigure
-
-      export GOCACHE=$TMPDIR/go-cache
-      export GOPATH="$TMPDIR/go"
-      export GOPROXY=file://${go-modules}
-
-      runHook postConfigure
-    '';
-
-    buildPhase = args.buildPhase or ''
-      runHook preBuild
-
-      buildGoDir() {
-        local d; local cmd;
-        cmd="$1"
-        d="$2"
-        . $TMPDIR/buildFlagsArray
-        echo "$d" | grep -q "\(/_\|examples\|Godeps\|testdata\)" && return 0
-        [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0
-        local OUT
-        if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" -v -p $NIX_BUILD_CORES $d 2>&1)"; then
-          if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then
-            echo "$OUT" >&2
-            return 1
-          fi
-        fi
-        if [ -n "$OUT" ]; then
-          echo "$OUT" >&2
-        fi
-        return 0
-      }
-
-      getGoDirs() {
-        local type;
-        type="$1"
-        if [ -n "$subPackages" ]; then
-          echo "$subPackages" | sed "s,\(^\| \),\1./,g"
-        else
-          find . -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort --unique
-        fi
-      }
-
-      if (( "''${NIX_DEBUG:-0}" >= 1 )); then
-        buildFlagsArray+=(-x)
-      fi
-
-      if [ ''${#buildFlagsArray[@]} -ne 0 ]; then
-        declare -p buildFlagsArray > $TMPDIR/buildFlagsArray
-      else
-        touch $TMPDIR/buildFlagsArray
-      fi
-      if [ -z "$enableParallelBuilding" ]; then
-          export NIX_BUILD_CORES=1
-      fi
-      for pkg in $(getGoDirs ""); do
-        echo "Building subPackage $pkg"
-        buildGoDir install "$pkg"
-      done
-    '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
-      # normalize cross-compiled builds w.r.t. native builds
-      (
-        dir=$GOPATH/bin/${go.GOOS}_${go.GOARCH}
-        if [[ -n "$(shopt -s nullglob; echo $dir/*)" ]]; then
-          mv $dir/* $dir/..
-        fi
-        if [[ -d $dir ]]; then
-          rmdir $dir
-        fi
-      )
-    '' + ''
-      runHook postBuild
-    '';
-
-    doCheck = args.doCheck or false;
-    checkPhase = args.checkPhase or ''
-      runHook preCheck
-
-      for pkg in $(getGoDirs test); do
-        buildGoDir test "$pkg"
-      done
-
-      runHook postCheck
-    '';
-
-    installPhase = args.installPhase or ''
-      runHook preInstall
-
-      mkdir -p $out
-      dir="$GOPATH/bin"
-      [ -e "$dir" ] && cp -r $dir $out
-
-      runHook postInstall
-    '';
-
-    preFixup = (args.preFixup or "") + ''
-      find $out/bin -type f -exec ${removeExpr removeReferences} '{}' + || true
-    '';
-
-    disallowedReferences = lib.optional (!allowGoReference) go;
-
-    passthru = passthru // { inherit go go-modules; };
-
-    meta = {
-      # Add default meta information
-      platforms = go.meta.platforms or lib.platforms.all;
-    } // meta // {
-      # add an extra maintainer to every package
-      maintainers = (meta.maintainers or []) ++
-                    [ lib.maintainers.kalbasit ];
-    };
-  });
-in if disabled then
-  throw "${package.name} not supported for go ${go.meta.branch}"
-else
-  package
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
deleted file mode 100644
index 47d8397c9668..000000000000
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ patchSet, useRailsExpress, ops, patchLevel }:
-
-rec {
-  "2.3.8" = ops useRailsExpress [
-    "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch"
-    "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch"
-    "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch"
-  ];
-  "2.4.5" = ops useRailsExpress [
-    "${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch"
-    "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch"
-    "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch"
-  ];
-  "2.5.5" = ops useRailsExpress [
-    "${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
-    "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch"
-    "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch"
-  ];
-  "2.6.3" = ops useRailsExpress [
-    "${patchSet}/patches/ruby/2.6/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
-    "${patchSet}/patches/ruby/2.6/head/railsexpress/02-improve-gc-stats.patch"
-    "${patchSet}/patches/ruby/2.6/head/railsexpress/03-more-detailed-stacktrace.patch"
-  ];
-}
diff --git a/sys/default.nix b/sys/default.nix
new file mode 100644
index 000000000000..7d23118cb6ad
--- /dev/null
+++ b/sys/default.nix
@@ -0,0 +1,9 @@
+let
+  nixos = import ../modules;
+  buildSystem = configuration: (nixos { inherit configuration; }).system;
+
+in
+
+{
+  x220 = buildSystem ./x220.nix;
+}
diff --git a/sys/x220.nix b/sys/x220.nix
new file mode 100644
index 000000000000..fcd436baf09a
--- /dev/null
+++ b/sys/x220.nix
@@ -0,0 +1,53 @@
+{ pkgs, ... }:
+
+{
+  imports = [
+    ../modules/workstation/physical
+    ../modules/workstation/podman
+    ../modules/nixos-hardware/lenovo/thinkpad/x220
+  ];
+
+  hardware.enableRedistributableFirmware = true;
+
+  boot.initrd.availableKernelModules =
+    [ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
+
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.systemd-boot.consoleMode = "max";
+
+  boot.initrd.luks.devices."nixos-decrypted".device =
+    "/dev/disk/by-uuid/bb59aa96-f934-4900-a98b-a364b8dccefe";
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/002e2225-6a03-4692-bac2-f57e5588ee49";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/5FED-1194";
+    fsType = "vfat";
+  };
+
+  swapDevices = [
+    {
+      device = "/dev/disk/by-partuuid/201f5472-f45e-49b7-88c9-7fd9458a30f7";
+      randomEncryption = true;
+    }
+  ];
+
+  nix.maxJobs = 2;
+  powerManagement.cpuFreqGovernor = "powersave";
+
+  networking.hostName = "x220";
+
+  system.stateVersion = "18.09";
+
+  users.users.qyliss.hashedPassword = "$5$rounds=1000000$tySRQ3rdqbPOduux$NcW7CoffEScpmOyS0Ga9gE5ZNLt8PT6.2Gvwn91vQn7";
+
+  hardware.opengl.enable = true;
+  hardware.opengl.extraPackages = with pkgs; [ libGL ];
+
+  services.evscript.devices = [ "/dev/input/by-path/platform-i8042-serio-0-event" ];
+}