Vladimír Čunát 8ba92b8895 Merge master into stdenv-updates ... Conflicts (simple): pkgs/development/tools/misc/binutils/default.nix pkgs/tools/package-management/disnix/default.nix pkgs/top-level/all-packages.nix		2013-07-08 10:48:05 +02:00
..
arduino
compilers	Merge master into stdenv-updates	2013-07-08 10:48:05 +02:00
eclipse
guile-modules
interpreters	Merge master into stdenv-updates	2013-07-08 10:48:05 +02:00
libraries	Merge master into stdenv-updates	2013-07-08 10:48:05 +02:00
misc	amdappsdk: Fix download urls and some other things, so derivations for older sdk versions now build succesfully	2013-06-20 02:22:18 +00:00
mobile	titaniumsdk: Bump to version 3.1.1	2013-06-13 13:58:32 +02:00
ocaml-modules	libpng: keep versioning in all-packages.nix, not in individual expressions	2013-06-27 21:35:21 +02:00
perl-modules
python-modules	fix bad "licence" names	2013-07-04 18:16:34 +02:00
qtcreator
ruby-modules
tools	Merge master into stdenv-updates	2013-07-08 10:48:05 +02:00
web	plone: updating plone.app.discussion to 2.2.7	2013-07-04 20:26:06 +02:00