nixpkgs/nixos/modules/system
Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
..
activation Merge recent 'staging' into closure-size 2016-02-03 16:57:19 +01:00
boot Merge recent 'staging' into closure-size 2016-02-03 16:57:19 +01:00
etc etc: Use a friendlier name than "etc-file" 2015-12-30 15:17:30 +01:00