Vladimír Čunát 9443129b08 Merge master into stdenv-updates ...

Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)

2014-01-04 18:34:53 +01:00

..

arduino

ino: update to 0.3.6

2013-11-26 23:55:31 +01:00

compilers

Merge master into stdenv-updates

2014-01-04 18:34:53 +01:00

eclipse

…

guile-modules

guile_lib: update from 0.2.1 to 0.2.2

2013-12-16 01:36:18 +02:00

interpreters

Merge master into stdenv-updates

2014-01-04 18:34:53 +01:00

libraries

Merge master into stdenv-updates

2014-01-04 18:34:53 +01:00

lisp-modules

Merge branch 'origin/master' into stdenv-updates.

2013-12-16 21:13:24 +01:00

misc

…

mobile

Make xcode detection a bit more robust and configurable

2013-12-24 14:34:56 +01:00

ocaml-modules

added OCaml package ocamlsdl

2013-12-05 16:20:32 +01:00

perl-modules

perlPackages.DBFile: update from 1.826 to 1.831

2013-12-21 02:28:25 +02:00

python-modules

setuptools: 0.9.8 -> 2.0.2

2013-12-29 19:15:36 +01:00

qtcreator

…

r-modules/generic

…

ruby-modules

…

tools

Merge master into stdenv-updates

2014-01-04 18:34:53 +01:00

web

csslint: update from 0.5.0 to 0.10.0

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