Eelco Dolstra d5758c99a3 Merge remote-tracking branch 'origin/master' into x-updates ...

Conflicts:
	pkgs/misc/maven/maven-1.0.nix
	pkgs/os-specific/linux/xf86-input-wacom/default.nix

2012-09-26 14:51:51 -04:00

..

default.nix

webkit: Update to 1.8.1 in attempt to fix build with new glib

2012-07-16 00:16:03 -04:00

gtk2.nix

webkit-1.4: fix build (perl versions)

2012-07-21 15:46:23 +02:00

src-for-default.nix

webkit: Update to 1.8.1 in attempt to fix build with new glib

2012-07-16 00:16:03 -04:00

src-for-gtk2.nix

Porting a fix from nixpkgs trunk - vimprobable2 now builds (against obsolete WebKit/GTK2)

2012-03-29 10:30:47 +00:00

src-for-svn.nix

…

src-info-for-default.nix

…

src-info-for-svn.nix

…

svn.nix

Make nixpkgs ready for gst_all attrset removal

2012-03-14 22:44:52 +00:00