Shea Levy ea9c8d6a13 Merge branch 'rippled' of git://github.com/ehmry/nixpkgs ... rippled: initial pkg and module expressions Had to change the rippled uid. Conflicts: nixos/modules/misc/ids.nix		2014-04-05 14:23:29 -04:00
..
config	power-management: Don't enable acpid.	2014-03-15 12:17:00 +01:00
hardware	Upgrade bumblebee and add nixos module	2014-02-09 15:09:41 +01:00
installer	nixos-hardware-scan: Detect QEMU	2014-03-30 17:27:18 +02:00
misc	Merge branch 'rippled' of git://github.com/ehmry/nixpkgs	2014-04-05 14:23:29 -04:00
profiles	Turn on user-controlled wpa-cli on the livecd	2014-04-04 17:05:57 -04:00
programs	Merge branch 'zsh' of git://github.com/ttuegel/nixpkgs	2014-03-15 13:11:38 -04:00
security	nixos: add Duo Security module	2014-03-16 07:11:50 -05:00
services	Merge branch 'rippled' of git://github.com/ehmry/nixpkgs	2014-04-05 14:23:29 -04:00
system	systemd: Add support for path units.	2014-03-31 12:33:25 +02:00
tasks	Add fuse to env by default	2014-04-03 21:36:13 -04:00
testing	Rename linuxManualConfig to buildLinux	2014-01-21 20:05:55 -05:00
virtualisation	Fix VirtualBox image generation	2014-03-31 11:15:11 +02:00
module-list.nix	Merge branch 'rippled' of git://github.com/ehmry/nixpkgs	2014-04-05 14:23:29 -04:00
rename.nix	move windowManager.xbmc to desktopManager.xbmc	2014-03-12 09:20:59 +01:00