obadz 57ddc155fc Merge branch 'master' into staging ... Conflicts: pkgs/games/scummvm/default.nix		2016-08-28 12:20:59 +01:00
..
arduino
beam-modules
bower-modules/generic
compilers	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00
coq-modules
dotnet-modules/patches
eclipse
em-modules/generic
go-modules
guile-modules
haskell-modules	Merge branch 'master' into staging	2016-08-28 12:20:59 +01:00
idris-modules
interpreters	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00
libraries	Merge branch 'master' into staging	2016-08-28 12:20:59 +01:00
lisp-modules
lua-modules
misc
mobile	treewide: Use more makeLibraryPath	2016-08-23 02:56:12 +03:00
ocaml-modules	ocaml-magick: fix darwin build	2016-08-20 00:05:35 +02:00
perl-modules
pharo
pure-modules
python-modules	Merge branch 'master' into staging	2016-08-28 12:20:59 +01:00
qtcreator
r-modules
ruby-modules	buildRubyGem: don't set the GEM_HOME	2016-08-23 09:30:49 +01:00
tools	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00
web	valum: 0.2.0 -> 0.2.16, fixes hardened build	2016-08-24 20:18:46 +02:00