4 files changed, 42 insertions, 45 deletions
diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix
index 60516190355..ce95ca00e11 100644
--- a/pkgs/misc/drivers/epson-escpr/default.nix
+++ b/pkgs/misc/drivers/epson-escpr/default.nix
@@ -1,46 +1,41 @@
 { stdenv, fetchurl, cups }:
 
-let
-  version = "1.6.12";
-in
-  stdenv.mkDerivation {
-
-    name = "epson-escpr-${version}";
-  
-    src = fetchurl {
-
-      url = "https://download3.ebz.epson.net/dsc/f/03/00/05/46/21/01534966894f35247dac8c8ef0a0a9c94d1c8b40/epson-inkjet-printer-escpr-1.6.12-1lsb3.2.tar.gz";
-      sha256 = "3773e74a0c4debf202eb9ad0aa31c6614a93d6170484ff660c14e99f8698cfda";
-    }; 
-
-    patches = [ ./cups-filter-ppd-dirs.patch ]; 
-
-    buildInputs = [ cups ];
-
-    meta = with stdenv.lib; {
-      homepage = http://download.ebz.epson.net/dsc/search/01/search/;
-      description = "ESC/P-R Driver (generic driver)";
-      longDescription = ''
-        Epson Inkjet Printer Driver (ESC/P-R) for Linux and the
-	corresponding PPD files. The list of supported printers
-	can be found at http://www.openprinting.org/driver/epson-escpr/ .
-
-	To use the driver adjust your configuration.nix file:
-	  services.printing = {
-	    enable = true;
-	    drivers = [ pkgs.epson-escpr ];
-	  };
-
-  To setup a wireless printer, enable Avahi which provides
-  printer's hostname to CUPS and nss-mdns to make this
-  hostname resolvable:
-    services.avahi = {
-      enable = true;
-      nssmdns = true;
-    };'';
-      license = licenses.gpl3Plus;
-      maintainers = with maintainers; [ artuuge ];
-      platforms = platforms.linux;
-    };
-
-  }
+stdenv.mkDerivation rec {
+  name = "epson-escpr-${version}";
+  version = "1.6.16";
+
+  src = fetchurl {
+    url = "https://download3.ebz.epson.net/dsc/f/03/00/06/41/54/29588ed107f800e5bc3f91706661567efb369c1c/epson-inkjet-printer-escpr-1.6.16-1lsb3.2.tar.gz";
+    sha256 = "0v9mcih3dg3ws18hdcgm014k97hv6imga39hy2a84gnc6badp6n6";
+  };
+
+  patches = [ ./cups-filter-ppd-dirs.patch ];
+
+  buildInputs = [ cups ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://download.ebz.epson.net/dsc/search/01/search/";
+    description = "ESC/P-R Driver (generic driver)";
+    longDescription = ''
+      Epson Inkjet Printer Driver (ESC/P-R) for Linux and the
+      corresponding PPD files. The list of supported printers
+      can be found at http://www.openprinting.org/driver/epson-escpr/ .
+
+      To use the driver adjust your configuration.nix file:
+        services.printing = {
+          enable = true;
+          drivers = [ pkgs.epson-escpr ];
+        };
+
+      To setup a wireless printer, enable Avahi which provides
+      printer's hostname to CUPS and nss-mdns to make this
+      hostname resolvable:
+        services.avahi = {
+          enable = true;
+          nssmdns = true;
+        };'';
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ artuuge ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/misc/emulators/cdemu/base.nix b/pkgs/misc/emulators/cdemu/base.nix
index cc9d11f8643..e587151d3e7 100644
--- a/pkgs/misc/emulators/cdemu/base.nix
+++ b/pkgs/misc/emulators/cdemu/base.nix
@@ -32,5 +32,6 @@ in stdenv.mkDerivation ({
     homepage = http://cdemu.sourceforge.net/;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ bendlas ];
   };
 } // drvParams)
diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix
index 7ec83959e38..d03b18f12d6 100644
--- a/pkgs/misc/emulators/cdemu/vhba.nix
+++ b/pkgs/misc/emulators/cdemu/vhba.nix
@@ -18,5 +18,6 @@ stdenv.mkDerivation rec {
     homepage = http://cdemu.sourceforge.net/about/vhba/;
     platforms = platforms.linux;
     licenses = licenses.gpl2Plus;
+    maintainers = with stdenv.lib.maintainers; [ bendlas ];
   };
 }
diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index 0f59892cce1..64bb8b4e356 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -109,6 +109,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
     homepage = http://www.winehq.org/;
     license = "LGPL";
     description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
-    maintainers = with stdenv.lib.maintainers; [ avnik raskin ];
+    maintainers = with stdenv.lib.maintainers; [ avnik raskin bendlas ];
   };
 })