diff --git a/pkgs/development/interpreters/self/default.nix b/pkgs/development/interpreters/self/default.nix
index 9c45c0cc9848..cf62399adc64 100644
--- a/pkgs/development/interpreters/self/default.nix
+++ b/pkgs/development/interpreters/self/default.nix
@@ -1,11 +1,11 @@
 { fetchgit, stdenv, xorg, makeWrapper, ncurses, cmake }:
 
 stdenv.mkDerivation {
-  # The Self wrapper stores source in $XDG_DATA_HOME/self or ~/.local/share/self 
+  # The Self wrapper stores source in $XDG_DATA_HOME/self or ~/.local/share/self
   # so that it can be written to when using the Self transposer. Running 'Self'
   # after installation runs without an image. You can then build a Self image with:
   #   $ cd ~/.local/share/self/objects
-  #   $ Self 
+  #   $ Self
   #   > 'worldBuilder.self' _RunScript
   #
   # This image can later be started with:
diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix
index 946fed92f581..8672a7e44940 100644
--- a/pkgs/games/instead/default.nix
+++ b/pkgs/games/instead/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
     substituteInPlace configure.sh \
       --replace "/tmp/sdl-test" $(mktemp)
   '';
-  
+
   configurePhase = ''
     { echo 2; echo $out; } | ./configure.sh
   '';
diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix
index 23e059d33ac9..4976076e35c5 100644
--- a/pkgs/misc/emulators/stella/default.nix
+++ b/pkgs/misc/emulators/stella/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ SDL2 ];
-  
+
   enableParallelBuilding = true;
 
   meta = {
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     the GNU General Public License (GPL). Stella was originally
     developed for Linux by Bradford W. Mott, and is currently
     maintained by Stephen Anthony.
-    As of its 3.5 release, Stella is officially donationware. 
+    As of its 3.5 release, Stella is officially donationware.
     '';
     homepage = "https://stella-emu.github.io/";
     license = licenses.gpl2;
diff --git a/pkgs/misc/sound-of-sorting/default.nix b/pkgs/misc/sound-of-sorting/default.nix
index a0b789835c0f..6b660232d52c 100644
--- a/pkgs/misc/sound-of-sorting/default.nix
+++ b/pkgs/misc/sound-of-sorting/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "01bpzn38cwn9zlydzvnfz9k7mxdnjnvgnbcpx7i4al8fha7x9lw8";
   };
 
-  buildInputs = 
+  buildInputs =
   [ wxGTK SDL2 ];
 
   preConfigure = ''
diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix
index 18a9f6669adc..00ed93c860c1 100644
--- a/pkgs/servers/http/jboss/default.nix
+++ b/pkgs/servers/http/jboss/default.nix
@@ -10,12 +10,12 @@ stdenv.mkDerivation {
   buildInputs = [ unzip ];
 
   phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
-  
+
   installPhase = ''
     mv $PWD $out
     find $out/bin -name \*.sh -print0 | xargs -0 sed -i -e '/#!\/bin\/sh/aJAVA_HOME=${jdk}'
   '';
-  
+
   meta = with stdenv.lib; {
     homepage = "https://www.jboss.org/";
     description = "Open Source J2EE application server";
diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index ef9447898f87..a55c1d8db661 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub
 , autoreconfHook, pkgconfig
 , gtk3, nssTools, pcsclite
-, libxml2, libproxy 
+, libxml2, libproxy
 , openssl, curl
 , makeWrapper
 , substituteAll }:
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
       --replace "modutil" "${nssTools}/bin/modutil"
 
     rm $out/bin/about-eid-mw
-    wrapProgram $out/bin/eid-viewer --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/$name" 
+    wrapProgram $out/bin/eid-viewer --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/$name"
   '';
 
   enableParallelBuilding = true;
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
     license = licenses.lgpl3;
     longDescription = ''
       Allows user authentication and digital signatures with Belgian ID cards.
-      Also requires a running pcscd service and compatible card reader. 
+      Also requires a running pcscd service and compatible card reader.
 
       eid-viewer is also installed.