Luca Bruno 83221f3886 Merge branch 'master' into staging ...

Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing

2014-11-08 15:56:40 +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

Revert "nixos: iso-image: use syslinux bootloader for USB booting support"

2014-11-08 14:33:27 +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

ssmtp: add 'root' option

2014-11-05 02:47:59 +03:00

security

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

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

services

Merge branch 'master' into staging

2014-11-08 15:56:40 +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 branch 'master' into staging

2014-11-08 15:56:40 +01:00

module-list.nix

nixos: Add a filesystem module for JFS.

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

rename.nix

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

2014-11-06 21:59:04 +01:00