Committing some outstanding modifications that I cannot make into smaller chunks anymore.

* added briss: a pdf cropper
* added compton, an improved fork of xcompmgr
* added myself to the maintainers list
* minor version bumps: xcompmgr, upower


svn path=/nixpkgs/trunk/; revision=34380

pkgs/applications/window-managers/compton/default.nix

@@ -0,0 +1,25 @@
+{ stdenv, fetchgit, pkgconfig, libXcomposite, libXfixes, libXdamage
+, libXrender, libXext }:
+stdenv.mkDerivation rec {
+  name = "compton-20120507";
+  src = fetchgit {
+    url = git://github.com/chjj/compton.git;
+    rev = "d52f7a06dbc55d92e061f976730952177edac739";
+    sha256 = "0f7600a841c4c77d181b54bc14cf7d90d0bad25aa5edbade320ca8b9946f14eb";
+  };
+  buildInputs = [ pkgconfig libXcomposite libXfixes libXdamage libXrender libXext ];
+  buildFlagsArray = ["CFLAGS=-O3 -fomit-frame-pointer"];
+  installFlags = "PREFIX=$(out)";
+  meta = {
+    homepage = http://www.x.org/;
+    description = "A fork of XCompMgr, a sample compositing manager for X servers";
+    longDescription = ''
+      A fork of XCompMgr, which is a  sample compositing manager for X servers
+      supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE extensions.  It enables
+      basic eye-candy effects. This fork adds additional features, such as additional
+      effects, and a fork at a well-defined and proper place.
+    '';
+    license = "bsd";
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}

pkgs/applications/window-managers/xcompmgr/default.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, libXcomposite, libXfixes, libXdamage
-, libXrender }:
+, libXrender, libXext }:
 stdenv.mkDerivation rec {
-  name = "xcompmgr-1.1.5";
+  name = "xcompmgr-1.1.6";
   src = fetchurl {
     url = "http://www.x.org/releases/individual/app/${name}.tar.bz2";
-    sha256 = "bb20737a6f9e0cdf5cfbd5288b6a9a4b16ca18d2be19444549c1d6be2a90b571";
+    sha256 = "c98949d36793b30ed1ed47495c87a05fa245ac0fc2857d2abc54979124687c02";
   };
-  buildInputs = [ pkgconfig libXcomposite libXfixes libXdamage libXrender ];
+  buildInputs = [ pkgconfig libXcomposite libXfixes libXdamage libXrender libXext ];
   meta = {
     homepage = http://www.x.org/;
     description = "A sample compositing manager for X servers";