Vladimír Čunát 52404a868d Merge recent master into staging ...

Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f82be3

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix

2014-11-05 15:00:44 +01:00

..

config

Merge recent master into staging

2014-11-05 15:00:44 +01:00

hardware

ati_unfree: Update nixos-manual for AMD driver support

2014-09-07 12:42:32 +10:00

installer

Merge pull request #4238 from wkennington/master.boost

2014-11-03 23:03:01 +01:00

misc

nixos: prosody was clashing with seeks unix ids

2014-10-20 17:22:01 +02:00

profiles

jfsrec: Remove derivation

2014-11-02 17:22:27 -08:00

programs

alsa: Add multilib plugin support via "libs" entry in asound config.

2014-10-04 14:48:58 +02:00

security

sudo: allow adding extra configuration options to the bottom of sudoers

2014-11-02 13:27:05 +01:00

services

Merge recent master into staging

2014-11-05 15:00:44 +01:00

system

Merge recent master into staging

2014-11-05 15:00:44 +01:00

tasks

nixos: Add a filesystem module for JFS.

2014-10-22 08:22:57 +02:00

testing

nixos: Fix priorities of initialHashedPassword.

2014-11-04 05:19:07 +01:00

virtualisation

Merge recent master into staging

2014-11-05 15:00:44 +01:00

module-list.nix

nixos: Add a filesystem module for JFS.

2014-10-22 08:22:57 +02:00

rename.nix

Revert "syslog-ng: Update from 3.5.6 to 3.6.1"

2014-11-02 17:22:28 -08:00