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
commitc5441d30682e0dbe31ebc09bfff6fc0bd0056677 (patch)
tree9201c304bbe936b0e40b8526959ba519db52e154 /nixpkgs/default.nix
parent7675c4ca52b4e34b9e411b6aee3b31fc129e7b50 (diff)
parenta2f2f15c5ac0e4d37f8c8e3dcbacab696c832404 (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 0000000..92da82c
--- /dev/null
+++ b/nixpkgs/default.nix
@@ -0,0 +1 @@
+import <upstream-nixpkgs>