Merge branch 'staging' into closure-size

2016-01-19 09:55:31 +01:00
parent f8472457a4 53b389327e
commit 716aac2519
1293 changed files with 75245 additions and 28520 deletions
@@ -14,6 +14,12 @@ stdenv.mkDerivation rec {
  NIX_CFLAGS_COMPILE = "-include stdio.h";

  meta = {
+    description = "CUPS back-end for Canon printers";
+    longDescription = ''
+      CUPS back-end for the canon printers using the proprietary USB over IP
+      BJNP protocol. This back-end allows Cups to print over the network to a
+      Canon printer. The design is based on reverse engineering of the protocol.
+    '';
    homepage = http://cups-bjnp.sourceforge.net;
  };
 }