Charles Strahan 145733c479 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby ...

Conflicts:
	pkgs/applications/version-management/redmine/default.nix
	pkgs/development/interpreters/ruby/gem.nix
	pkgs/development/interpreters/ruby/generated.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/tools/vagrant/default.nix
	pkgs/servers/consul/default.nix

2014-12-28 14:29:52 -05:00

..

config

Switch default timezone in NixOS from "CET" to "UTC".

2014-12-15 16:31:18 +01:00

hardware

Remove udev from /run/opengl-drivers

2014-12-17 17:00:10 +01:00

installer

Merge pull request #5390 from abbradar/nixos-isntall

2014-12-23 18:15:14 +01:00

misc

Merge pull request #5419 from ehmry/tox-bootstrapd

2014-12-22 11:16:44 +01:00

profiles

nixos: container profile, fix a few things

2014-12-12 20:28:01 +01:00

programs

nixos/virtualbox: Revert disable hardening.

2014-12-18 18:18:32 +01:00

security

Improve /etc/sudoers message

2014-12-18 11:51:42 +01:00

services

Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby

2014-12-28 14:29:52 -05:00

system

Eradicate gzip -9 without -n

2014-12-28 13:45:27 +01:00

tasks

zfs hostId: Instructions to derive from machine-id

2014-12-18 22:52:29 +01:00

testing

nixos: Fix priorities of initialHashedPassword.

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

virtualisation

virtualisation.qemuNetworkingOptions -> virtualisation.qemu.networkingOptions

2014-12-19 11:59:00 +01:00

module-list.nix

Merge pull request #5419 from ehmry/tox-bootstrapd

2014-12-22 11:16:44 +01:00

rename.nix

Rewrite Fontconfig NixOS module

2014-12-08 10:55:23 -06:00