summaryrefslogtreecommitdiffstats
path: root/nixpkgs/default.nix
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
commit72dc2dd7fa54c77e08052efed21f68758fa533a2 (patch)
treef2c4e93c670764134913408a6d43c2ff6c6ac15e /nixpkgs/default.nix
parent186d5cc95a7430136da3107734409511c64d7080 (diff)
parent1a5a3c0cf2aba173772765c24a0865bb2da6b691 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'nixpkgs/default.nix')
-rw-r--r--nixpkgs/default.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/nixpkgs/default.nix b/nixpkgs/default.nix
new file mode 100644
index 00000000..92da82c3
--- /dev/null
+++ b/nixpkgs/default.nix
@@ -0,0 +1 @@
+import <upstream-nixpkgs>