Vladimír Čunát 4c5a71f777 Merge master into x-updates ...

Conflicts:
	pkgs/desktops/gnome-2/desktop/gvfs/default.nix
	pkgs/development/libraries/cogl/default.nix
	pkgs/development/libraries/libsoup/2.44.nix

2013-12-18 23:21:29 +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 x-updates

2013-12-18 23:21:29 +01:00

foldingathome

* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless

2012-01-18 20:16:00 +00:00

freestyle

* Fix some more "args: with args".

2010-07-30 14:47:23 +00:00

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

slock: update from 1.0 to 1.1

2013-12-04 06:23:35 +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

mate-themes: update from 1.6.1 to 1.6.2

2013-12-18 18:18:38 +02:00

uboot

clean up git revision handling in several packages

2013-11-13 12:46:55 +02:00

vim-plugins

vimPlugins.ipython: add expression

2013-10-29 15:45:46 +02:00

xosd

* More cleanup.

2010-07-28 15:35:01 +00:00

misc.nix

add versionedDerivation

2013-05-08 15:43:07 +03:00