From 2ed911999cacb93c8ebc6ca51c013ccb680f1aeb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 12:17:33 +0000
Subject: [PATCH 01/15] dumb-init: 1.2.4 -> 1.2.5

---
 pkgs/applications/virtualization/dumb-init/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/dumb-init/default.nix b/pkgs/applications/virtualization/dumb-init/default.nix
index 80a76432f08b..bb265dc5488a 100644
--- a/pkgs/applications/virtualization/dumb-init/default.nix
+++ b/pkgs/applications/virtualization/dumb-init/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dumb-init";
-  version = "1.2.4";
+  version = "1.2.5";
 
   src = fetchFromGitHub {
     owner = "Yelp";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0v6ggfjl3q5p4hf002ygs8rryyzrg0fqy836p403fq2fgm30k0xx";
+    sha256 = "sha256-aRh0xfmp+ToXIYjYaducTpZUHndZ5HlFZpFhzJ3yKgs=";
   };
 
   buildInputs = [ glibc.static ];

From c0e781d9adc4cd7f637e1e1be29eb4dd80e6b7bd Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 20 Jan 2021 04:20:00 +0000
Subject: [PATCH 02/15] python3Packages.tubeup: 0.0.20 -> 0.0.21

---
 pkgs/development/python-modules/tubeup/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/tubeup/default.nix b/pkgs/development/python-modules/tubeup/default.nix
index 297642599107..7a4b4454b3b6 100644
--- a/pkgs/development/python-modules/tubeup/default.nix
+++ b/pkgs/development/python-modules/tubeup/default.nix
@@ -2,27 +2,27 @@
 , buildPythonPackage
 , internetarchive
 , fetchPypi
-, youtube-dlc
+, youtube-dl
 , docopt
 , isPy27
 }:
 
 buildPythonPackage rec {
   pname = "tubeup";
-  version = "0.0.20";
+  version = "0.0.21";
 
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8bf4004629b8427173c8259e1a09065db99135d6cc390b70a8a67b52a34a3f67";
+    sha256 = "326a499be032bee7f7ed921d85abff4b3b4dcd2c3d6ad694f08ef98dbcef19b6";
   };
 
   postPatch = ''
     substituteInPlace setup.py --replace "docopt==0.6.2" "docopt"
   '';
 
-  propagatedBuildInputs = [ internetarchive docopt youtube-dlc ];
+  propagatedBuildInputs = [ internetarchive docopt youtube-dl ];
 
   pythonImportsCheck = [ "tubeup" ];
 

From 6d25d3e09d3fc1ceadf250ac75499eb7f7c3f7d9 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 20 Jan 2021 04:20:00 +0000
Subject: [PATCH 03/15] python3Packages.youtube-dlc: drop

tubeup uses youtube-dl, and upstream seems to be unmaintained.
---
 .../python-modules/youtube-dlc/default.nix    | 23 -------------------
 pkgs/top-level/python-packages.nix            |  2 --
 2 files changed, 25 deletions(-)
 delete mode 100644 pkgs/development/python-modules/youtube-dlc/default.nix

diff --git a/pkgs/development/python-modules/youtube-dlc/default.nix b/pkgs/development/python-modules/youtube-dlc/default.nix
deleted file mode 100644
index 9599828e65ee..000000000000
--- a/pkgs/development/python-modules/youtube-dlc/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi }:
-
-buildPythonPackage rec {
-  pname = "youtube_dlc";
-  version = "2020.11.11.post3";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "WqoKpfvVPZrN+pW6s8JoApJusn5CXyPcg9VcsY8R0FM=";
-  };
-
-  # They are broken
-  doCheck = false;
-
-  pythonImportsCheck = [ "youtube_dlc" ];
-
-  meta = with lib; {
-    homepage = "Media downloader supporting various sites such as youtube";
-    description = "https://github.com/blackjack4494/yt-dlc";
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ freezeboy ];
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5de1f1958dcf..1e7ce27a8cda 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8337,8 +8337,6 @@ in {
     phantomjsSupport = false;
   };
 
-  youtube-dlc = callPackage ../development/python-modules/youtube-dlc { };
-
   yowsup = callPackage ../development/python-modules/yowsup { };
 
   yq = callPackage ../development/python-modules/yq { };

From 1d6ebd3f203ce870143b4bad80aea5a76400b53a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 05:45:18 +0000
Subject: [PATCH 04/15] lynis: 3.0.1 -> 3.0.3

---
 pkgs/tools/security/lynis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix
index 42a6bfd34146..27dc6504e8bb 100644
--- a/pkgs/tools/security/lynis/default.nix
+++ b/pkgs/tools/security/lynis/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lynis";
-  version = "3.0.1";
+  version = "3.0.3";
 
   src = fetchFromGitHub {
     owner = "CISOfy";
     repo = pname;
     rev = version;
-    sha256 = "0lsb455rimr1cjxqcgy819xjxf1faas8wlx2x0pxhn5yha9w9sfs";
+    sha256 = "sha256-+RkzsBcQhHrfY8gEiJK3ptDeulJzA3IuVXiYEpyAsmk=";
   };
 
   nativeBuildInputs = [ installShellFiles makeWrapper ];

From 16348982c98384a2da15e4209439e3f3d39f7521 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 14:14:42 +0000
Subject: [PATCH 05/15] opentx: 2.3.10 -> 2.3.11

---
 pkgs/applications/misc/opentx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix
index 53dbde29a0ea..bb8f8d4013f1 100644
--- a/pkgs/applications/misc/opentx/default.nix
+++ b/pkgs/applications/misc/opentx/default.nix
@@ -6,13 +6,13 @@
 
 mkDerivation rec {
   pname = "opentx";
-  version = "2.3.10";
+  version = "2.3.11";
 
   src = fetchFromGitHub {
     owner = "opentx";
     repo = "opentx";
     rev = "release/${version}";
-    sha256 = "1pp3k1802gl1rji98clv17wj0619dliq821mpi4446lk22q692yq";
+    sha256 = "sha256-0B41TkTs4sNGYzpMGbsgCLT2ThkP6foeuwLUIzKKGkU=";
   };
 
   nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow ];

From 26e315fd42db568342c4272bd48afa1fb3dee0c0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 16:20:53 +0000
Subject: [PATCH 06/15] buildpack: 0.15.1 -> 0.16.0

---
 pkgs/development/tools/buildpack/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/development/tools/buildpack/default.nix
index dbb45df40c25..68d0a53387a6 100644
--- a/pkgs/development/tools/buildpack/default.nix
+++ b/pkgs/development/tools/buildpack/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "pack";
-  version = "0.15.1";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "buildpacks";
     repo = pname;
     rev = "v${version}";
-    sha256 = "026qy81hfblx98z9hip7gpqcfqgzfhm5bimg6p9gi5fd5wsbfs4c";
+    sha256 = "sha256-fNPgdMwqQq2Gh/rkf6KHEd34rnQqhw7Jf1L34oVorqM=";
   };
 
-  vendorSha256 = "0i6nplh1papcmdzas9f8pkccsx5csbxxkvy5a6130jjbwdm14jw7";
+  vendorSha256 = "sha256-U38j5fxECKjYr5pqaNk0+Z0opQNqiYV2+6dIEaHUVF8=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From de946cddcbe09b10bdbbdced9b054bd8a89d76d0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 17:33:44 +0000
Subject: [PATCH 07/15] papirus-icon-theme: 20200901 -> 20210101

---
 pkgs/data/icons/papirus-icon-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix
index b79013461821..ed5f8e7c4c2a 100644
--- a/pkgs/data/icons/papirus-icon-theme/default.nix
+++ b/pkgs/data/icons/papirus-icon-theme/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "papirus-icon-theme";
-  version = "20200901";
+  version = "20210101";
 
   src = fetchFromGitHub {
     owner = "PapirusDevelopmentTeam";
     repo = pname;
     rev = version;
-    sha256 = "00khqbd7jz97q1kd43kkm6yaa40ml36rh04s76sgbm58srs66v3c";
+    sha256 = "sha256-RHuT+zJQyhiApeLuh821PMI9dmD20OoRVxezF/uCWoE=";
   };
 
   nativeBuildInputs = [

From 88fd1ecdc6eaff947162bd9523a083d96efe7120 Mon Sep 17 00:00:00 2001
From: Diego Rodriguez <diego@noteable.io>
Date: Wed, 20 Jan 2021 13:37:07 -0700
Subject: [PATCH 08/15] terraform_0_14: 0.14.4 -> 0.14.5

---
 pkgs/applications/networking/cluster/terraform/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index a190994e7469..9e01674eab2d 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -157,9 +157,9 @@ in rec {
   });
 
   terraform_0_14 = pluggable (generic {
-    version = "0.14.4";
-    sha256 = "0kjbx1gshp1lvhnjfigfzza0sbl3m6d9qb3in7q5vc6kdkiplb66";
-    vendorSha256 = "10vb6gsw7mha99lvx3lbgd80vf0imcqyc0va0y64f6wzaw557n7v";
+    version = "0.14.5";
+    sha256 = "0drf049zghpm3ajrn006w621s7bw5r1s8gl77nd1cj2zcw2nzn1r";
+    vendorSha256 = "0z9mkilazrkpbccnkws4hcc49djdwzn0cdbgqkm9bnp9fyg3rfvs";
     patches = [ ./provider-path.patch ];
     passthru = { inherit plugins; };
   });

From 5388f5bb7a0b56bd496a8d27a4c12599e45c9ed0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 22:03:38 +0000
Subject: [PATCH 09/15] portfolio: 0.50.0 -> 0.50.2

---
 pkgs/applications/office/portfolio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix
index 1f44ce2ab511..ad52e75ac358 100644
--- a/pkgs/applications/office/portfolio/default.nix
+++ b/pkgs/applications/office/portfolio/default.nix
@@ -24,11 +24,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "PortfolioPerformance";
-  version = "0.50.0";
+  version = "0.50.2";
 
   src = fetchurl {
     url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
-    sha256 = "1jq4if5hx3fwag1dz38sj87av2na1kv4c36hai1gyz9w5qhjv7j8";
+    sha256 = "sha256-n5tLYrqqM0KUQrlJWZtKGClKONAz3EXBAlEqIrdPBpI=";
   };
 
   nativeBuildInputs = [

From 21afdc1355e31a99d386a7f64965e1145bf73c0d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 01:12:41 +0000
Subject: [PATCH 10/15] postgresql11Packages.pgroonga: 2.2.7 -> 2.2.8

---
 pkgs/servers/sql/postgresql/ext/pgroonga.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix
index be2843871740..b3d0bd5e2e84 100644
--- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "pgroonga";
-  version = "2.2.7";
+  version = "2.2.8";
 
   src = fetchurl {
     url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "1rd3cxap9rqpg5y8y48r5bd7rki3lck6qsrb0bqdqm9xffnibw8j";
+    sha256 = "sha256-YDDO3t6ARbQv72QotjA7DNxOlRo2O5CYzrH+/eEzj3w=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From 4a8c551c8938f02418dae001e5910c90f1d1495b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 11:06:08 +0000
Subject: [PATCH 11/15] neochat: 1.0 -> 1.0.1

---
 .../networking/instant-messengers/neochat/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/neochat/default.nix b/pkgs/applications/networking/instant-messengers/neochat/default.nix
index 03e74de7780d..bcd6fdc9f3e4 100644
--- a/pkgs/applications/networking/instant-messengers/neochat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/neochat/default.nix
@@ -26,14 +26,14 @@
 
 mkDerivation rec {
   pname = "neochat";
-  version = "1.0";
+  version = "1.0.1";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "network";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1r9n83kvc5v215lzmzh6hyc5q9i3w6znbf508qk0mdwdzxz4zry9";
+    sha256 = "sha256-xGqGFJHyoZXHLv/n3UGr/KVbgs5Gc9kKKWIuKMr9DtQ=";
   };
 
   nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ];

From fa2e1dd70a3cad3f018c5c29ca9bee429cdea9f6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 02:13:04 +0000
Subject: [PATCH 12/15] python37Packages.colorcet: 2.0.2 -> 2.0.6

---
 pkgs/development/python-modules/colorcet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/colorcet/default.nix b/pkgs/development/python-modules/colorcet/default.nix
index 05304175b71d..303d244fff33 100644
--- a/pkgs/development/python-modules/colorcet/default.nix
+++ b/pkgs/development/python-modules/colorcet/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "colorcet";
-  version = "2.0.2";
+  version = "2.0.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1vkx00im4s6zhr2m1j9r0a5vmhkl488b4xpzxb1pidbl19wi6j2i";
+    sha256 = "efa44b6f4078261e62d0039c76aba17ac8d3ebaf0bc2291a111aee3905313433";
   };
 
   propagatedBuildInputs = [

From 932941b79c3dbbef2de9440e1631dfec43956261 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 21 Jan 2021 10:55:55 +1000
Subject: [PATCH 13/15] treewide: editorconfig fixes

- remove trailing whitespace
- use spaces for indentation
---
 .../science/biology/blast/default.nix         |  8 +++---
 .../science/biology/ncbi-tools/default.nix    |  4 +--
 .../science/chemistry/molden/default.nix      |  3 +-
 .../science/electronics/geda/default.nix      |  2 +-
 .../schemas/xml-dtd/xhtml1/default.nix        |  2 +-
 .../compilers/apache-flex-sdk/default.nix     |  4 +--
 pkgs/development/compilers/bigloo/default.nix |  8 +++---
 pkgs/development/compilers/opendylan/bin.nix  |  4 +--
 .../interpreters/angelscript/2.22.nix         |  2 +-
 pkgs/development/libraries/amrnb/default.nix  |  2 +-
 pkgs/development/libraries/snack/default.nix  |  4 +--
 .../libraries/waylandpp/default.nix           |  4 +--
 .../mobile/androidenv/emulator.nix            |  2 +-
 .../development/mobile/xcodeenv/build-app.nix |  4 +--
 .../ocaml-modules/mlgmp/default.nix           |  2 +-
 .../ocaml-modules/mysql/default.nix           |  4 +--
 .../python-modules/pyregion/default.nix       |  4 +--
 .../tools/database/squirrel-sql/default.nix   |  4 +--
 pkgs/development/tools/dtools/default.nix     |  2 +-
 .../tools/gtk-mac-bundler/default.nix         |  2 +-
 pkgs/development/tools/micronaut/default.nix  |  8 +++---
 pkgs/development/tools/misc/gede/default.nix  |  2 +-
 .../tools/ocaml/obelisk/default.nix           | 28 +++++++++----------
 pkgs/development/tools/qtcreator/default.nix  | 12 ++++----
 pkgs/development/tools/vagrant/default.nix    |  2 +-
 pkgs/games/mrrescue/default.nix               |  4 +--
 pkgs/games/sienna/default.nix                 |  2 +-
 pkgs/games/vapor/default.nix                  |  4 +--
 pkgs/misc/emulators/wine/util.nix             |  2 +-
 pkgs/misc/source-and-tags/default.nix         |  6 ++--
 .../networking/guardian-agent/default.nix     |  6 ++--
 pkgs/tools/system/cm-rgb/default.nix          |  2 +-
 32 files changed, 74 insertions(+), 75 deletions(-)

diff --git a/pkgs/applications/science/biology/blast/default.nix b/pkgs/applications/science/biology/blast/default.nix
index a72f16938d41..6fd061f1402d 100644
--- a/pkgs/applications/science/biology/blast/default.nix
+++ b/pkgs/applications/science/biology/blast/default.nix
@@ -10,15 +10,15 @@ stdenv.mkDerivation rec {
   };
 
   sourceRoot = "ncbi-blast-${version}+-src/c++";
-  
-  configureFlags = [ 
+
+  configureFlags = [
     # With flat Makefile we can use all_projects in order not to build extra.
     # These extra cause clang to hang on Darwin.
     "--with-flat-makefile"
-    "--without-makefile-auto-update" 
+    "--without-makefile-auto-update"
     "--with-dll"  # build dynamic libraries (static are default)
     ];
-  
+
   makeFlags = [ "all_projects=app/" ];
 
   preConfigure = ''
diff --git a/pkgs/applications/science/biology/ncbi-tools/default.nix b/pkgs/applications/science/biology/ncbi-tools/default.nix
index cc8ebf7f37d9..c5220ebc83b5 100644
--- a/pkgs/applications/science/biology/ncbi-tools/default.nix
+++ b/pkgs/applications/science/biology/ncbi-tools/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     sha256 = "1b2v0dcdqn3bysgdkj57sxmd6s0hc9wpnxssviz399g6plhxggbr";
   };
 
-  configureFlags = [ 
+  configureFlags = [
     "--without-debug"
     "--with-bin-release"
     "--with-dll"
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = ''NCBI Bioinformatics toolbox (incl. BLAST)'';
     longDescription = ''The NCBI Bioinformatics toolsbox, including command-line utilties, libraries and include files. No X11 support'';
-    homepage = "http://www.ncbi.nlm.nih.gov/IEB/ToolBox/"; 
+    homepage = "http://www.ncbi.nlm.nih.gov/IEB/ToolBox/";
     license = "GPL";
     priority = 5;   # zlib.so gives a conflict with zlib
     broken = true;
diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix
index ac3dd513f34b..32e8f6ee56e2 100644
--- a/pkgs/applications/science/chemistry/molden/default.nix
+++ b/pkgs/applications/science/chemistry/molden/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
                                   --replace '-I/usr/X11R6/include' "" \
                                   --replace '/usr/local/' $out/ \
                                   --replace 'sudo' "" \
-				                          --replace '-C surf depend' '-C surf'
+                                  --replace '-C surf depend' '-C surf'
      sed -in '/^# DO NOT DELETE THIS LINE/q;' surf/Makefile
   '';
 
@@ -41,4 +41,3 @@ stdenv.mkDerivation rec {
      maintainers = with maintainers; [ markuskowa ];
   };
 }
-
diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix
index 053211f52ade..cf98e6963e1f 100644
--- a/pkgs/applications/science/electronics/geda/default.nix
+++ b/pkgs/applications/science/electronics/geda/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   };
 
   configureFlags = [
-    "--disable-update-xdg-database" 
+    "--disable-update-xdg-database"
   ];
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ guile gtk2 flex gawk perl ];
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix
index a000c4249067..c698098e6c12 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
       xmlcatalog --noout --create $cat
       grep PUBLIC DTD/*.soc | while read x; do
           eval a=($x)
-          xmlcatalog --noout --add public "''${a[1]}" "''${a[2]}" $cat 
+          xmlcatalog --noout --add public "''${a[1]}" "''${a[2]}" $cat
       done
     ''; # */
 
diff --git a/pkgs/development/compilers/apache-flex-sdk/default.nix b/pkgs/development/compilers/apache-flex-sdk/default.nix
index ed6b2b2ff247..337d5a4e26db 100644
--- a/pkgs/development/compilers/apache-flex-sdk/default.nix
+++ b/pkgs/development/compilers/apache-flex-sdk/default.nix
@@ -38,13 +38,13 @@ in stdenv.mkDerivation rec {
     for i in $out/bin/!(aasdoc|acompc|amxmlc); do
       wrapProgram $i \
         --set FLEX_HOME $t \
-        --set PLAYERGLOBAL_HOME $t/frameworks/libs/player/ 
+        --set PLAYERGLOBAL_HOME $t/frameworks/libs/player/
     done
 
     mkdir -p $t/frameworks/libs/player/${playerglobal_ver}/
     cp ${playerglobal} $t/frameworks/libs/player/${playerglobal_ver}/playerglobal.swc
   '';
-  
+
   fixupPhase = ":";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix
index a3bac2b1722c..ced7dd07a22b 100644
--- a/pkgs/development/compilers/bigloo/default.nix
+++ b/pkgs/development/compilers/bigloo/default.nix
@@ -32,14 +32,14 @@ stdenv.mkDerivation rec {
     # Fix absolute paths.
     sed -e 's=/bin/mv=mv=g' -e 's=/bin/rm=rm=g'			\
         -e 's=/tmp=$TMPDIR=g' -i autoconf/*		\
-	[Mm]akefile*   */[Mm]akefile*   */*/[Mm]akefile*	\
-	*/*/*/[Mm]akefile*   */*/*/*/[Mm]akefile*		\
-	comptime/Cc/cc.scm gc/install-*
+        [Mm]akefile*   */[Mm]akefile*   */*/[Mm]akefile*	\
+        */*/*/[Mm]akefile*   */*/*/*/[Mm]akefile*		\
+        comptime/Cc/cc.scm gc/install-*
 
     # Make sure we don't change string lengths in the generated
     # C files.
     sed -e 's=/bin/rm=     rm=g' -e 's=/bin/mv=     mv=g'	\
-	-i comptime/Cc/cc.c
+        -i comptime/Cc/cc.c
   '';
 
   checkTarget = "test";
diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix
index dbe7e44b1d78..7636b251e62e 100644
--- a/pkgs/development/compilers/opendylan/bin.nix
+++ b/pkgs/development/compilers/opendylan/bin.nix
@@ -22,11 +22,11 @@ stdenv.mkDerivation {
     tar --strip-components=1 -xjf "$src" -C "$out"
 
     interpreter="$(cat "$NIX_CC"/nix-support/dynamic-linker)"
-    for a in "$out"/bin/*; do 
+    for a in "$out"/bin/*; do
       patchelf --set-interpreter "$interpreter" "$a"
       patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a"
     done
-    for a in "$out"/lib/*.so; do 
+    for a in "$out"/lib/*.so; do
       patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a"
     done
     sed -i -e "s|\-lgc|\-L${boehmgc.out}\/lib -lgc|" $out/lib/config.jam
diff --git a/pkgs/development/interpreters/angelscript/2.22.nix b/pkgs/development/interpreters/angelscript/2.22.nix
index 0449572da024..15e7f4dd5c13 100644
--- a/pkgs/development/interpreters/angelscript/2.22.nix
+++ b/pkgs/development/interpreters/angelscript/2.22.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   preConfigure = ''
     cd angelscript/projects/gnuc
     sed -i makefile -e "s@LOCAL = .*@LOCAL = $out@"
-    export SHARED=1 
+    export SHARED=1
     export VERSION="${s.version}"
     mkdir -p "$out/lib" "$out/bin" "$out/share" "$out/include"
   '';
diff --git a/pkgs/development/libraries/amrnb/default.nix b/pkgs/development/libraries/amrnb/default.nix
index aaee86c62ef7..4e8aab263ebf 100644
--- a/pkgs/development/libraries/amrnb/default.nix
+++ b/pkgs/development/libraries/amrnb/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   configureFlags = [ "--cache-file=config.cache" "--with-downloader=true" ];
 
   postConfigure = ''
-    cp $srcAmr 26104-b00.zip 
+    cp $srcAmr 26104-b00.zip
   '';
 
   meta = {
diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix
index 2297fd07eb1e..e9af9f6d5374 100644
--- a/pkgs/development/libraries/snack/default.nix
+++ b/pkgs/development/libraries/snack/default.nix
@@ -23,10 +23,10 @@ stdenv.mkDerivation {
 
   installPhase = ''
     mkdir -p $out
-    make install DESTDIR="$out" 
+    make install DESTDIR="$out"
   '';
 
-  meta = { 
+  meta = {
     description = "The Snack Sound Toolkit (Tcl)";
     homepage = "http://www.speech.kth.se/snack/";
     license = stdenv.lib.licenses.gpl2;
diff --git a/pkgs/development/libraries/waylandpp/default.nix b/pkgs/development/libraries/waylandpp/default.nix
index 923329ab3fde..d528d51ed790 100644
--- a/pkgs/development/libraries/waylandpp/default.nix
+++ b/pkgs/development/libraries/waylandpp/default.nix
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
     sha256 = "1kxiqab48p0n97pwg8c2zx56wqq32m3rcq7qd2pjj33ipcanb3qq";
   };
 
-  cmakeFlags = [ 
-    "-DCMAKE_INSTALL_DATADIR=${placeholder "dev"}" 
+  cmakeFlags = [
+    "-DCMAKE_INSTALL_DATADIR=${placeholder "dev"}"
   ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "-DWAYLAND_SCANNERPP=${buildPackages.waylandpp}/bin/wayland-scanner++"
   ];
diff --git a/pkgs/development/mobile/androidenv/emulator.nix b/pkgs/development/mobile/androidenv/emulator.nix
index 5840598d1c32..e08078ea6725 100644
--- a/pkgs/development/mobile/androidenv/emulator.nix
+++ b/pkgs/development/mobile/androidenv/emulator.nix
@@ -38,7 +38,7 @@ deployAndroidPackage {
 
     # Wrap emulator so that it can load required libraries at runtime
     wrapProgram $out/libexec/android-sdk/emulator/emulator \
-      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ 
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
         pkgs.dbus
         pkgs.systemd
       ]} \
diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix
index fa108c8e4706..adf64f9561c6 100644
--- a/pkgs/development/mobile/xcodeenv/build-app.nix
+++ b/pkgs/development/mobile/xcodeenv/build-app.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation ({
     # Be sure that the Xcode wrapper has priority over everything else.
     # When using buildInputs this does not seem to be the case.
     export PATH=${xcodewrapper}/bin:$PATH
-    
+
     ${stdenv.lib.optionalString release ''
       export HOME=/Users/$(whoami)
       keychainName="$(basename $out)"
@@ -69,7 +69,7 @@ stdenv.mkDerivation ({
       security unlock-keychain -p "" $keychainName
 
       # Import the certificate into the keychain
-      security import ${certificateFile} -k $keychainName -P "${certificatePassword}" -A 
+      security import ${certificateFile} -k $keychainName -P "${certificatePassword}" -A
 
       # Grant the codesign utility permissions to read from the keychain
       security set-key-partition-list -S apple-tool:,apple: -s -k "" $keychainName
diff --git a/pkgs/development/ocaml-modules/mlgmp/default.nix b/pkgs/development/ocaml-modules/mlgmp/default.nix
index d2aeb1a37b8a..ffd78150689a 100644
--- a/pkgs/development/ocaml-modules/mlgmp/default.nix
+++ b/pkgs/development/ocaml-modules/mlgmp/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     sha256 = "3ce1a53fa452ff5a9ba618864d3bc46ef32190b57202d1e996ca7df837ad4f24";
   };
 
-  makeFlags = [ 
+  makeFlags = [
     "DESTDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/gmp"
   ];
 
diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix
index 29720ce1148d..6ccdfa9cf81c 100644
--- a/pkgs/development/ocaml-modules/mysql/default.nix
+++ b/pkgs/development/ocaml-modules/mysql/default.nix
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
     sha256 = "06mb2bq7v37wn0lza61917zqgb4bsg1xxb73myjyn88p6khl6yl2";
   };
 
-  configureFlags = [ 
-     "--prefix=$out" 
+  configureFlags = [
+     "--prefix=$out"
      "--libdir=$out/lib/ocaml/${ocaml.version}/site-lib/mysql"
   ];
 
diff --git a/pkgs/development/python-modules/pyregion/default.nix b/pkgs/development/python-modules/pyregion/default.nix
index b1868e7edde5..86a5ef6bfe0f 100644
--- a/pkgs/development/python-modules/pyregion/default.nix
+++ b/pkgs/development/python-modules/pyregion/default.nix
@@ -33,8 +33,8 @@ buildPythonPackage rec {
       name = "conftest-astropy-3-fix.patch";
       url = "https://github.com/astropy/pyregion/pull/136.patch";
       sha256 = "13yxjxiqnhjy9gh24hvv6pnwx7qic2mcx3ccr1igjrc3f881d59m";
-	  })
-	];
+    })
+  ];
 
   nativeBuildInputs = [ astropy-helpers ];
 
diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix
index 924a82bfd85e..c773db7509fa 100644
--- a/pkgs/development/tools/database/squirrel-sql/default.nix
+++ b/pkgs/development/tools/database/squirrel-sql/default.nix
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
 
   installPhase = ''
     runHook preInstall
-    
+
     mkdir -p $out/share/squirrel-sql
     cp -r . $out/share/squirrel-sql
 
@@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
     ln -s $out/share/squirrel-sql/icons/acorn.png \
       $out/share/icons/hicolor/32x32/apps/squirrel-sql.png
     ln -s ${desktopItem}/share/applications $out/share
-    
+
     runHook postInstall
   '';
 
diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix
index 5efa579ec5a1..fabd2b2f7752 100644
--- a/pkgs/development/tools/dtools/default.nix
+++ b/pkgs/development/tools/dtools/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
       $makeCmd INSTALL_DIR=$out install
-	'';
+  '';
 
   meta = with stdenv.lib; {
     description = "Ancillary tools for the D programming language compiler";
diff --git a/pkgs/development/tools/gtk-mac-bundler/default.nix b/pkgs/development/tools/gtk-mac-bundler/default.nix
index df21f414ecb8..c4ac76f46123 100644
--- a/pkgs/development/tools/gtk-mac-bundler/default.nix
+++ b/pkgs/development/tools/gtk-mac-bundler/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   installPhase = ''
-  	mkdir -p $out/bin
+    mkdir -p $out/bin
     substitute gtk-mac-bundler.in $out/bin/gtk-mac-bundler \
       --subst-var-by PATH $out/share
     chmod a+x $out/bin/gtk-mac-bundler
diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix
index ddf9d84f3bf4..1139215fbf85 100644
--- a/pkgs/development/tools/micronaut/default.nix
+++ b/pkgs/development/tools/micronaut/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     rm bin/mn.bat
     cp -r . $out
     wrapProgram $out/bin/mn \
-      --prefix JAVA_HOME : ${jdk} 
+      --prefix JAVA_HOME : ${jdk}
     installShellCompletion --bash --name mn.bash bin/mn_completion
     runHook postInstall
   '';
@@ -26,9 +26,9 @@ stdenv.mkDerivation rec {
     longDescription = ''
       Micronaut is a modern, JVM-based, full stack microservices framework
       designed for building modular, easily testable microservice applications.
-      Reflection-based IoC frameworks load and cache reflection data for 
-      every single field, method, and constructor in your code, whereas with 
-      Micronaut, your application startup time and memory consumption are 
+      Reflection-based IoC frameworks load and cache reflection data for
+      every single field, method, and constructor in your code, whereas with
+      Micronaut, your application startup time and memory consumption are
       not bound to the size of your codebase.
     '';
     homepage = "https://micronaut.io/";
diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix
index b27c3a515bbe..39954b458b4d 100644
--- a/pkgs/development/tools/misc/gede/default.nix
+++ b/pkgs/development/tools/misc/gede/default.nix
@@ -20,7 +20,7 @@ mkDerivation rec {
   installPhase = ''
     python build.py install --verbose --prefix="$out"
     wrapProgram $out/bin/gede \
-      --prefix PATH : ${lib.makeBinPath [ ctags gdb ]} 
+      --prefix PATH : ${lib.makeBinPath [ ctags gdb ]}
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/tools/ocaml/obelisk/default.nix b/pkgs/development/tools/ocaml/obelisk/default.nix
index 483e9c45df01..d5e9d33d5db6 100644
--- a/pkgs/development/tools/ocaml/obelisk/default.nix
+++ b/pkgs/development/tools/ocaml/obelisk/default.nix
@@ -1,20 +1,20 @@
 { lib, fetchurl, ocamlPackages }:
 
 ocamlPackages.buildDunePackage rec {
-	pname = "obelisk";
-	version = "0.5.2";
-	useDune2 = true;
-	src = fetchurl {
-		url = "https://github.com/Lelio-Brun/Obelisk/releases/download/v${version}/obelisk-v${version}.tbz";
-		sha256 = "0s86gkypyrkrp83xnay258ijri3yjwj3marsjnjf8mz58z0zd9g6";
-	};
+  pname = "obelisk";
+  version = "0.5.2";
+  useDune2 = true;
+  src = fetchurl {
+    url = "https://github.com/Lelio-Brun/Obelisk/releases/download/v${version}/obelisk-v${version}.tbz";
+    sha256 = "0s86gkypyrkrp83xnay258ijri3yjwj3marsjnjf8mz58z0zd9g6";
+  };
 
-	buildInputs = with ocamlPackages; [ menhir re ];
+  buildInputs = with ocamlPackages; [ menhir re ];
 
-	meta = {
-		description = "A simple tool which produces pretty-printed output from a Menhir parser file (.mly)";
-		license = lib.licenses.mit;
-		maintainers = [ lib.maintainers.vbgl ];
-		homepage = "https://github.com/Lelio-Brun/Obelisk";
-	};
+  meta = {
+    description = "A simple tool which produces pretty-printed output from a Menhir parser file (.mly)";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.vbgl ];
+    homepage = "https://github.com/Lelio-Brun/Obelisk";
+  };
 }
diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix
index a750a21c1b4c..40e3e42d84cc 100644
--- a/pkgs/development/tools/qtcreator/default.nix
+++ b/pkgs/development/tools/qtcreator/default.nix
@@ -1,6 +1,6 @@
 { mkDerivation, lib, fetchurl, fetchgit, fetchpatch
 , qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake, llvmPackages_8
-, withDocumentation ? false, withClangPlugins ? true 
+, withDocumentation ? false, withClangPlugins ? true
 }:
 
 with lib;
@@ -28,9 +28,9 @@ mkDerivation rec {
     sha256 = "0ibn7bapw7m26nmxl26dns1hnpawfdqk1i1mgg0gjssja8famszg";
   };
 
-  buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ] ++ 
-    optionals withClangPlugins [ llvmPackages_8.libclang 
-                                 clang_qt_vendor 
+  buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ] ++
+    optionals withClangPlugins [ llvmPackages_8.libclang
+                                 clang_qt_vendor
                                  llvmPackages_8.llvm ];
 
   nativeBuildInputs = [ qmake ];
@@ -38,7 +38,7 @@ mkDerivation rec {
   # 0001-Fix-clang-libcpp-regexp.patch is for fixing regexp that is used to
   # find clang libc++ library include paths. By default it's not covering paths
   # like libc++-version, which is default name for libc++ folder in nixos.
-  # ./0002-Dont-remove-clang-header-paths.patch is for forcing qtcreator to not 
+  # ./0002-Dont-remove-clang-header-paths.patch is for forcing qtcreator to not
   # remove system clang include paths.
   patches = [ ./0001-Fix-clang-libcpp-regexp.patch
               ./0002-Dont-remove-clang-header-paths.patch ];
@@ -53,7 +53,7 @@ mkDerivation rec {
 
   preConfigure = ''
     substituteInPlace src/plugins/plugins.pro \
-      --replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls' 
+      --replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls'
     '' + optionalString withClangPlugins ''
     # Fix paths for llvm/clang includes directories.
     substituteInPlace src/shared/clang/clang_defines.pri \
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index b3f1bf1a5b8f..701b973ad4f7 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -34,7 +34,7 @@ let
       for gem in "$out"/lib/ruby/gems/*/gems/*; do
         cp -a "$gem/" "$gem.new"
         rm "$gem"
-        # needed on macOS, otherwise the mv yields permission denied 
+        # needed on macOS, otherwise the mv yields permission denied
         chmod +w "$gem.new"
         mv "$gem.new" "$gem"
       done
diff --git a/pkgs/games/mrrescue/default.nix b/pkgs/games/mrrescue/default.nix
index d3caa986b857..c5b2b7d20eb0 100644
--- a/pkgs/games/mrrescue/default.nix
+++ b/pkgs/games/mrrescue/default.nix
@@ -13,13 +13,13 @@ let
     name = "mrrescue";
     exec = pname;
     icon = icon;
-    comment = "Arcade-style fire fighting game"; 
+    comment = "Arcade-style fire fighting game";
     desktopName = "Mr. Rescue";
     genericName = "mrrescue";
     categories = "Game;";
   };
 
-in 
+in
 
 stdenv.mkDerivation {
   name = "${pname}-${version}";
diff --git a/pkgs/games/sienna/default.nix b/pkgs/games/sienna/default.nix
index 0a38723368e8..1a1e82b7d64d 100644
--- a/pkgs/games/sienna/default.nix
+++ b/pkgs/games/sienna/default.nix
@@ -13,7 +13,7 @@ let
     name = "sienna";
     exec = pname;
     icon = icon;
-    comment = "Fast-paced one button platformer"; 
+    comment = "Fast-paced one button platformer";
     desktopName = "Sienna";
     genericName = "sienna";
     categories = "Game;";
diff --git a/pkgs/games/vapor/default.nix b/pkgs/games/vapor/default.nix
index e79c49779af5..710280652636 100644
--- a/pkgs/games/vapor/default.nix
+++ b/pkgs/games/vapor/default.nix
@@ -14,13 +14,13 @@ let
     name = "Vapor";
     exec = pname;
     icon = icon;
-    comment = "LÖVE Distribution Client"; 
+    comment = "LÖVE Distribution Client";
     desktopName = "Vapor";
     genericName = "vapor";
     categories = "Game;";
   };
 
-in 
+in
 
 stdenv.mkDerivation {
   name = "${pname}-${version}";
diff --git a/pkgs/misc/emulators/wine/util.nix b/pkgs/misc/emulators/wine/util.nix
index b90a68e72df5..cd5bd03130b6 100644
--- a/pkgs/misc/emulators/wine/util.nix
+++ b/pkgs/misc/emulators/wine/util.nix
@@ -3,7 +3,7 @@ rec {
   toPackages = pkgNames: pkgs:
     map (pn: lib.getAttr pn pkgs) pkgNames;
   toBuildInputs = pkgArches: archPkgs:
-    lib.concatLists (map archPkgs pkgArches);  
+    lib.concatLists (map archPkgs pkgArches);
   mkBuildInputs = pkgArches: pkgNames:
     toBuildInputs pkgArches (toPackages pkgNames);
 }
diff --git a/pkgs/misc/source-and-tags/default.nix b/pkgs/misc/source-and-tags/default.nix
index 7c082cbbbb0f..c82b96b82f95 100644
--- a/pkgs/misc/source-and-tags/default.nix
+++ b/pkgs/misc/source-and-tags/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, glibcLocales, unzip, hasktags, ctags } : {
   # optional srcDir
-  annotatedWithSourceAndTagInfo = x : (x ? passthru && x.passthru ? sourceWithTags 
+  annotatedWithSourceAndTagInfo = x : (x ? passthru && x.passthru ? sourceWithTags
                                       || x ? meta && x.meta ? sourceWithTags );
   # hack because passthru doesn't work the way I'd expect. Don't have time to spend on this right now
   # that's why I'm abusing meta for the same purpose in ghcsAndLibs
@@ -10,7 +10,7 @@
 
   # createTagFiles =  [ { name  = "my_tag_name_without_suffix", tagCmd = "ctags -R . -o \$TAG_FILE"; } ]
   # tag command must create file named $TAG_FILE
-  sourceWithTagsDerivation = {name, src, srcDir ? ".", tagSuffix ? "_tags", createTagFiles ? []} :  
+  sourceWithTagsDerivation = {name, src, srcDir ? ".", tagSuffix ? "_tags", createTagFiles ? []} :
     stdenv.mkDerivation {
     phases = "unpackPhase buildPhase";
     inherit src srcDir tagSuffix;
@@ -72,7 +72,7 @@
 
 
   addCTaggingInfo = deriv :
-    deriv // { 
+    deriv // {
       passthru = {
         sourceWithTags = {
          inherit (deriv) src;
diff --git a/pkgs/tools/networking/guardian-agent/default.nix b/pkgs/tools/networking/guardian-agent/default.nix
index a736aa4df187..57080d223fa1 100644
--- a/pkgs/tools/networking/guardian-agent/default.nix
+++ b/pkgs/tools/networking/guardian-agent/default.nix
@@ -30,9 +30,9 @@ buildGoPackage rec {
   '';
 
   postFixup = ''
-		wrapProgram $out/bin/sga-guard \
-			--prefix PATH : "$out/bin" \
-			--prefix PATH : "${autossh}/bin"
+    wrapProgram $out/bin/sga-guard \
+      --prefix PATH : "$out/bin" \
+      --prefix PATH : "${autossh}/bin"
   '';
 
   meta = with lib; {
diff --git a/pkgs/tools/system/cm-rgb/default.nix b/pkgs/tools/system/cm-rgb/default.nix
index a50fa60197ac..9c75fe78c996 100644
--- a/pkgs/tools/system/cm-rgb/default.nix
+++ b/pkgs/tools/system/cm-rgb/default.nix
@@ -38,7 +38,7 @@ buildPythonApplication rec {
 
   postInstall = ''
     # Remove this line when/if this PR gets merged:
-    # https://github.com/gfduszynski/cm-rgb/pull/43 
+    # https://github.com/gfduszynski/cm-rgb/pull/43
     install -m0755 scripts/cm-rgb-gui $out/bin/cm-rgb-gui
 
     mkdir -p $out/etc/udev/rules.d

From 2f54cd04c2ac3c85a9b17c74c77eec3c0f6b7978 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 01:13:56 +0000
Subject: [PATCH 14/15] libquotient: 0.6.3 -> 0.6.4

---
 pkgs/development/libraries/libquotient/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix
index 84d7c51fd59e..10b2451e7c85 100644
--- a/pkgs/development/libraries/libquotient/default.nix
+++ b/pkgs/development/libraries/libquotient/default.nix
@@ -2,13 +2,13 @@
 
 mkDerivation rec {
   pname = "libquotient";
-  version = "0.6.3";
+  version = "0.6.4";
 
   src = fetchFromGitHub {
     owner = "quotient-im";
     repo = "libQuotient";
     rev = version;
-    sha256 = "sha256-RYEcFClRdAippG0kspNi9QZIzZAuU4++9LOQTZcqpVc=";
+    sha256 = "sha256-bWqZiRv/mJzw+WY+7dLIzYBu8jhglBqgTjiXyQ1y6IQ=";
   };
 
   buildInputs = [ qtbase qtmultimedia ];

From 9f07e60af20c34151fe53d4ec2cacc40c4783472 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 20 Jan 2021 22:41:24 -0500
Subject: [PATCH 15/15] rclone: 1.53.3 -> 1.53.4 (#110271)

https://forum.rclone.org/t/rclone-1-53-4-release/21792
---
 pkgs/applications/networking/sync/rclone/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index 7057e5cc2c5a..ef130d003295 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "rclone";
-  version = "1.53.3";
+  version = "1.53.4";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "10nimrq8nmpmfk2d4fx0yp916wk5q027m283izpshrbwvx7l6xx0";
+    sha256 = "1w6dsf8hw0wap4090ixl01p64yn53xidfdbpy6rc3xaifypj185d";
   };
 
   vendorSha256 = "1l4iz31k1pylvf0zrp4nhxna70s1ma4981x6q1s3dhszjxil5c88";
@@ -39,6 +39,7 @@ buildGoModule rec {
   meta = with lib; {
     description = "Command line program to sync files and directories to and from major cloud storage";
     homepage = "https://rclone.org";
+    changelog = "https://github.com/rclone/rclone/blob/v${version}/docs/content/changelog.md";
     license = licenses.mit;
     maintainers = with maintainers; [ danielfullmer marsam ];
   };