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

Conflicts:
	pkgs/applications/version-management/git-and-tools/default.nix
	pkgs/applications/version-management/git-and-tools/hub/default.nix
	pkgs/tools/audio/mpdcron/default.nix

2015-01-20 20:21:03 -05:00

..

config

fix manual

2015-01-03 16:32:07 +01:00

hardware

Bumblebee config to enable multiple monitors

2014-12-30 19:17:42 -08:00

installer

nixos-install: Create /root with 700 permission

2015-01-15 18:37:55 +01:00

misc

nixos: adding nylon service with uid,gid

2015-01-14 22:08:47 +01:00

profiles

nixos/base: Add efi management utilities

2015-01-07 01:52:47 -08:00

programs

Merge pull request #5726 from spwhitt/zsh-command-not-found

2015-01-17 18:15:35 +01:00

security

grsecurity: Add denyUSB option to grsec NixOS module

2015-01-20 19:18:06 +01:00

services

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

2015-01-20 20:21:03 -05:00

system

Merge pull request #4394 from wmertens/patch-6

2015-01-19 12:39:41 +01:00

tasks

nixos/network-interfaces: Fix rstp support

2015-01-14 10:34:28 -08:00

testing

test-instrumentation.nix: Prevent calling a pager

2015-01-15 14:39:29 +01:00

virtualisation

Paranoia

2015-01-15 18:37:55 +01:00

module-list.nix

Merge pull request #5301 from nbp/syncserver

2015-01-18 17:47:51 +01:00

rename.nix

modules: Extract mkAliasDefinition from the rename.nix NixOS module.

2014-12-22 22:38:38 +01:00