Aristid Breitkreuz 23be46bf2e Merge pull request #4465 from vbgl/maxima ... maxima: update from 5.33.0 to 5.34.1		2014-10-11 13:01:10 +02:00
..
applications	Merge pull request #4465 from vbgl/maxima	2014-10-11 13:01:10 +02:00
build-support	fix fetchurl	2014-10-05 19:23:27 +02:00
data	poppler_data: update from 0.4.6 to 0.4.7	2014-10-07 23:22:09 +02:00
desktops	Merge pull request #4457 from DamienCassou/gpaste-3.12.3.1	2014-10-10 15:39:55 +02:00
development	Merge pull request #4467 from vbgl/ocaml	2014-10-11 12:58:21 +02:00
games	Fix a silly mistake in the chocolateDoom packages, and bump master	2014-10-08 21:43:26 +01:00
misc	cupsBjnp: update from 1.2.1 to 1.2.2, potentially fixes CVE-2014-2856	2014-10-06 22:02:40 +02:00
os-specific	kernelPackages_3_17.{netatop,betman-adv}: disable	2014-10-10 21:35:26 +02:00
servers	mariadb: 10.0.13 -> 10.0.14	2014-10-09 17:01:06 -05:00
shells	zsh: update from 5.0.6 to 5.0.7	2014-10-09 09:43:33 +02:00
stdenv	Eliminate some optionals/optionalAttrs calls on the hot path	2014-10-05 01:59:24 +02:00
test
tools	Merge branch 'master' of github.com:ip1981/nixpkgs	2014-10-10 11:40:00 -04:00
top-level	Merge pull request #4467 from vbgl/ocaml	2014-10-11 12:58:21 +02:00