mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-12 15:47:28 +00:00
e5917ea6fc
The only conflict was the addition of two different options at the same place. svn path=/nixos/trunk/; revision=28801 |
||
---|---|---|
.. | ||
config | ||
hardware | ||
installer | ||
misc | ||
profiles | ||
programs | ||
security | ||
services | ||
system | ||
tasks | ||
testing | ||
virtualisation | ||
module-list.nix | ||
rename.nix |