summaryrefslogtreecommitdiffstats
path: root/nixpkgs/default.nix
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-02-16 17:15:00 +0100
committerlassulus <lass@aidsballs.de>2016-02-16 17:15:00 +0100
commit0b0b0d65ee05583529df831985580e392713d29a (patch)
tree7eb6799a996924d8e895c54633a47ea3d7a92a4c /nixpkgs/default.nix
parent3d30e9cc9014ec6189410944015d3cd7d5ca95a6 (diff)
parentb7a92f63884af00eb0243ec9328be689a6c9b845 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'nixpkgs/default.nix')
l---------nixpkgs/default.nix1
1 files changed, 0 insertions, 1 deletions
diff --git a/nixpkgs/default.nix b/nixpkgs/default.nix
deleted file mode 120000
index 74e9d7633..000000000
--- a/nixpkgs/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-../upstream-nixpkgs/default.nix \ No newline at end of file