summaryrefslogtreecommitdiffstats
path: root/nixpkgs/nixos/modules
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-02-01 15:17:16 +0100
committerlassulus <lass@aidsballs.de>2016-02-01 15:17:16 +0100
commitc5441d30682e0dbe31ebc09bfff6fc0bd0056677 (patch)
tree9201c304bbe936b0e40b8526959ba519db52e154 /nixpkgs/nixos/modules
parent7675c4ca52b4e34b9e411b6aee3b31fc129e7b50 (diff)
parenta2f2f15c5ac0e4d37f8c8e3dcbacab696c832404 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'nixpkgs/nixos/modules')
l---------nixpkgs/nixos/modules1
1 files changed, 1 insertions, 0 deletions
diff --git a/nixpkgs/nixos/modules b/nixpkgs/nixos/modules
new file mode 120000
index 0000000..8fbc437
--- /dev/null
+++ b/nixpkgs/nixos/modules
@@ -0,0 +1 @@
+../../upstream-nixpkgs/nixos/modules \ No newline at end of file