Domen Kožar bb4d658f64 Merge branch 'master' into staging ...

Conflicts:
	nixos/doc/manual/release-notes/rl-unstable.xml
	nixos/modules/services/printing/cupsd.nix
	pkgs/applications/misc/calibre/default.nix
	pkgs/development/haskell-modules/hackage-packages.nix
	pkgs/development/libraries/libsodium/default.nix
	pkgs/misc/emulators/wine/unstable.nix
	pkgs/top-level/all-packages.nix

2015-05-11 10:05:23 +02:00

..

arduino

…

compilers

Merge branch 'master' into staging

2015-05-11 10:05:23 +02:00

coq-modules

coqPackages.QuickChick: New expression

2015-05-10 13:45:59 +02:00

eclipse

…

go-modules/generic

pond: fix build by renaming imports, also add renameImports to goBuildPackage

2015-04-16 18:43:37 +02:00

guile-modules

…

haskell-modules

Merge branch 'master' into staging

2015-05-11 10:05:23 +02:00

interpreters

Update Regina/REXX

2015-05-10 13:46:30 +02:00

libraries

Merge branch 'master' into staging

2015-05-11 10:05:23 +02:00

lisp-modules

meta.description fixups

2015-04-30 18:17:42 +02:00

lua-modules

…

misc

avr-gcc-with-avr-libc: remove unused gcc-4.6 patch

2015-02-22 12:41:14 +01:00

mobile

androidsdk: Make monitor and other commands to work

2015-05-03 23:03:36 +09:00

ocaml-modules

meta.description fixups

2015-04-30 18:17:42 +02:00

perl-modules

DBD-mysql: 4.023 -> 4.031

2015-04-01 16:41:19 -07:00

pharo

Pharo launcher 0.2.4 -> 0.2.7

2015-05-05 15:15:31 +02:00

pure-modules/pure-gsl

…

python-modules

Revert "pycairo: set user-agent to fix download of patches"

2015-04-28 22:23:21 +02:00

qtcreator

…

r-modules

r-modules: disable broken builds on Hydra

2015-04-20 17:38:46 +02:00

ruby-modules

…

tools

Merge branch 'master' into staging

2015-05-11 10:05:23 +02:00

web

Choosing a different nodejs for armv5tel.

2015-05-03 18:02:55 +02:00