Vladimír Čunát 0a58b512cb Merge master into stdenv-updates ... Conflicts (simple): pkgs/development/compilers/gcc/4.8/default.nix pkgs/development/compilers/llvm/default.nix pkgs/development/libraries/gmp/5.1.1.nix pkgs/development/libraries/gmp/5.1.3.nix pkgs/development/libraries/gmp/5.1.x.nix pkgs/top-level/all-packages.nix		2014-01-18 14:46:20 +01:00
..
cups	cupsBjnp: update from 0.5.4 to 1.2.1	2013-12-18 18:18:23 +02:00
drivers	foomatic_filters: update from 4.0.12 to 4.0.17	2013-12-18 18:18:27 +02:00
emulators	Merge master into stdenv-updates	2014-01-18 14:46:20 +01:00
foldingathome	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
freestyle
ghostscript	ghostscript: Revert to 9.06	2013-09-26 18:03:43 +02:00
gxemul	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
jackaudio	jackaudio/default.nix: Update to 1.9.9.5.	2013-02-03 20:22:43 +04:00
lilypond	lilypond: add missing ghostscript path to wrapper	2013-09-28 21:07:48 +02:00
maven	Remove old maven versions, aliased maven to maven3. Updated maven 3 to 3.0.4	2012-08-25 19:43:54 +02:00
my-env	my-env: pull --norc shell flag out into shell parameter	2013-10-21 20:58:40 +03:00
screensavers	xscreensaver: update from 5.19 to 5.26	2013-12-21 02:28:26 +02:00
solfege	solfege: refactor meta attributes	2013-11-24 13:27:24 +01:00
source-and-tags	Remove unnecessary parentheses around if conditions	2012-12-28 19:54:15 +01:00
themes	gnome_themes_standard: bump to 3.10.0 and move into gnome3 attrset	2014-01-10 01:45:32 +01:00
uboot	clean up git revision handling in several packages	2013-11-13 12:46:55 +02:00
vim-plugins	vimPlugins.golang: add expression	2013-12-16 01:21:23 +00:00
xosd
misc.nix	add versionedDerivation	2013-05-08 15:43:07 +03:00