b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
* 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
This commit is contained in:
Arie Middelkoop 2012-06-08 10:16:46 +00:00
parent 789df7619e
commit 3c74283d03
6 changed files with 69 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pkgs/applications/window-managers/compton/default.nix Normal file
View file

@ -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;
};
}

8
pkgs/applications/window-managers/xcompmgr/default.nix
View file

@ -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";

1
pkgs/lib/maintainers.nix
View file

@ -6,6 +6,7 @@
aforemny = "Alexander Foremny <alexanderforemny@googlemail.com>";
all = "Nix Committers <nix-commits@lists.science.uu.nl>";
amiddelk = "Arie Middelkoop <amiddelk@gmail.com>";
andres = "Andres Loeh <ksnixos@andres-loeh.de>";
astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>";
bjg = "Brian Gough <bjg@gnu.org>";

4
pkgs/os-specific/linux/upower/default.nix
View file

@ -4,11 +4,11 @@
assert stdenv.isLinux;
stdenv.mkDerivation rec {
name = "upower-0.9.15";
name = "upower-0.9.16";
src = fetchurl {
url = "http://upower.freedesktop.org/releases/${name}.tar.xz";
sha256 = "1313lr404hb29fzkf9frn1z0xxvibi451xmk05sf9kidyf01956m";
sha256 = "eb9a3d39a8cb62970fd612e333bc7a43437ab0e7890303578b0a7e3c67c8c212";
};
buildInputs = [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 ];

31
pkgs/tools/graphics/briss/default.nix Normal file
View file

@ -0,0 +1,31 @@
# The releases of this project are apparently precompiled to .jar files.
{ stdenv, fetchurl, jre }:
let
version = "0.9";
sha256 = "45dd668a9ceb9cd59529a9fefe422a002ee1554a61be07e6fc8b3baf33d733d9";
in stdenv.mkDerivation {
name = "briss-${version}";
src = fetchurl {
url = "mirror://sourceforge/briss/briss-${version}.tar.gz";
inherit sha256;
};
installPhase = ''
mkdir -p "$out/bin";
mkdir -p "$out/share";
install -D -m444 -t "$out/share" *.jar
echo "#!/bin/sh" > "$out/bin/briss"
echo "${jre}/bin/java -Xms128m -Xmx1024m -cp \"$out/share/\" -jar \"$out/share/briss-${version}.jar\"" >> "$out/bin/briss"
chmod +x "$out/bin/briss"
'';
meta = {
homepage = http://sourceforge.net/projects/briss/;
description = "Java application for cropping PDF files";
license = stdenv.lib.licenses.gpl3;
};
}

6
pkgs/top-level/all-packages.nix
View file

@ -1229,6 +1229,8 @@ let
pdfread = callPackage ../tools/graphics/pdfread { };
briss = callPackage ../tools/graphics/briss { };
pdnsd = callPackage ../tools/networking/pdnsd { };
pg_top = callPackage ../tools/misc/pg_top { };
@ -7602,6 +7604,8 @@ let
wings = callPackage ../applications/graphics/wings { };
dzen2 = callPackage ../applications/misc/dzen { };
# I'm keen on wmiimenu only >wmii-3.5 no longer has it...
wmiimenu = import ../applications/window-managers/wmii31 {
libixp = libixp_for_wmii;
@ -7668,6 +7672,8 @@ let
xcompmgr = callPackage ../applications/window-managers/xcompmgr { };
compton = callPackage ../applications/window-managers/compton { };
xdaliclock = callPackage ../tools/misc/xdaliclock {};
xdg_utils = callPackage ../tools/X11/xdg-utils { };