diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix
index fa17fb5ffd2c..9bbc7c9e7395 100644
--- a/pkgs/applications/video/aegisub/default.nix
+++ b/pkgs/applications/video/aegisub/default.nix
@@ -5,7 +5,7 @@
 , libass, fftw, ffms
 , ffmpeg, pkgconfig, zlib # Undocumented (?) dependencies
 , spellChecking ? true, hunspell ? null
-, automationSupport ? true, lua ? null 
+, automationSupport ? true, lua ? null
 , openalSupport ? false, openal ? null
 , alsaSupport ? true, alsaLib ? null
 , pulseaudioSupport ? true, pulseaudio ? null
@@ -39,11 +39,11 @@ stdenv.mkDerivation rec {
   ;
 
   NIX_LDFLAGS = "-liconv -lavutil -lavformat -lavcodec -lswscale -lz -lm";
-  
-  preConfigure = "cd aegisub"; 
-  
+
+  preConfigure = "cd aegisub";
+
   postInstall = "ln -s $out/bin/aegisub-3.0 $out/bin/aegisub";
-  
+
   meta = {
     description = "An advanced subtitle editor";
     longDescription = ''
@@ -53,11 +53,11 @@ stdenv.mkDerivation rec {
       built-in real-time video preview.
     '';
     homepage = http://www.aegisub.org/;
-    license = stdenv.lib.licenses.bsd3; 
-              # The Aegisub sources are itself BSD/ISC, 
+    license = stdenv.lib.licenses.bsd3;
+              # The Aegisub sources are itself BSD/ISC,
               # but they are linked against GPL'd softwares
               # - so the resulting program will be GPL
-    maintainers = [ maintainers.AndersonTorres ];
+    maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
     platforms = stdenv.lib.platforms.linux;
 
   };
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 2ffefa35898f..f059472aa9b6 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -46,7 +46,7 @@ assert cacaSupport -> libcaca != null;
 # but by purity reasons it should be avoided; thanks the-kenny to point it out!
 # Now, it will just download and package Waf, mimetizing bootstrap.py behaviour
 
-let 
+let
   waf = fetchurl {
     url = https://waf.googlecode.com/files/waf-1.7.13;
     sha256 = "03cc750049350ee01cdbc584b70924e333fcc17ba4a2d04648dab1535538a873";
@@ -109,7 +109,7 @@ stdenv.mkDerivation rec {
     python3 ${waf} install
     # Maybe not needed, but it doesn't hurt anyway: a standard font
     mkdir -p $out/share/mpv
-    ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf  $out/share/mpv/subfont.ttf 
+    ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf  $out/share/mpv/subfont.ttf
     '';
 
   meta = {
@@ -119,7 +119,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "http://mpv.io";
     license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [ maintainers.AndersonTorres ];
+    maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/pkgs/applications/virtualization/8086tiny/default.nix
index ca93a1bfd7c6..1ad9203b94cc 100644
--- a/pkgs/applications/virtualization/8086tiny/default.nix
+++ b/pkgs/applications/virtualization/8086tiny/default.nix
@@ -13,12 +13,12 @@ stdenv.mkDerivation rec {
   version = "1.20";
 
   src = fetchurl {
-    url ="http://www.megalith.co.uk/8086tiny/downloads/8086tiny_120.tar.bz2"; 
+    url ="http://www.megalith.co.uk/8086tiny/downloads/8086tiny_120.tar.bz2";
     sha256 = "0yapnr8wvlx7h1q1w98yfy2vsbf0rlp4wd99r3xb0b7l70b36mpw";
   };
-  
+
   buildInputs = with stdenv.lib;
-  optionals localBios [ nasm ] 
+  optionals localBios [ nasm ]
   ++  optionals sdlSupport [ SDL ];
 
   builder = ./builder.sh;
@@ -27,12 +27,12 @@ stdenv.mkDerivation rec {
     description = "An open-source 8086 emulator";
     longDescription = ''
     8086tiny is a tiny, open source (MIT), portable (little-endian hosts) Intel PC emulator, powerful enough to run DOS, Windows 3.0, Excel, MS Flight Simulator, AutoCAD, Lotus 1-2-3, and similar applications. 8086tiny emulates a "late 80's era" PC XT-type machine.
-    
+
     8086tiny is based on an IOCCC 2013 winning entry. In fact that is the "unobfuscated" version :)
     '';
     homepage = http://www.megalith.co.uk/8086tiny/index.html;
     license = stdenv.lib.licenses.mit;
-    maintainers = [ maintainers.AndersonTorres ];
+    maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix
index 7b49bb8220da..75afcb41f808 100644
--- a/pkgs/applications/virtualization/bochs/default.nix
+++ b/pkgs/applications/virtualization/bochs/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     url = "http://downloads.sourceforge.net/project/bochs/bochs/${version}/${name}.tar.gz";
     sha256 = "042blm1xb9ig4fh2bv8nrrfpgkcxy4hq8yrkx7mrdpm5g4mvfwyr";
   };
-  
+
   buildInputs = with stdenv.lib;
   [ libX11 mesa ]
   ++ optionals sdlSupport [ SDL ]
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   ++ optionals curlSupport [ curl ];
 
   configureFlags = ''
-    --with-x11 
+    --with-x11
     --with-term=${if termSupport then "yes" else "no"}
     --with-sdl=${if sdlSupport then "yes" else "no"}
     --with-svga=no
@@ -42,11 +42,11 @@ stdenv.mkDerivation rec {
     --enable-plugins=no
     --enable-disasm
     --enable-debugger
-    --enable-ne2000 
-    --enable-e1000 
-    --enable-sb16 
-    --enable-voodoo 
-    --enable-usb 
+    --enable-ne2000
+    --enable-e1000
+    --enable-sb16
+    --enable-voodoo
+    --enable-usb
     --enable-pnic
 '';
 
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://bochs.sourceforge.net/;
     license = stdenv.lib.licenses.lgpl2Plus;
-    maintainers = [ maintainers.AndersonTorres ];
+    maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
     platforms = stdenv.lib.platforms.linux;
   };
 }