diff options
author | lassulus <lass@aidsballs.de> | 2016-02-01 15:17:16 +0100 |
---|---|---|
committer | lassulus <lass@aidsballs.de> | 2016-02-01 15:17:16 +0100 |
commit | 72dc2dd7fa54c77e08052efed21f68758fa533a2 (patch) | |
tree | f2c4e93c670764134913408a6d43c2ff6c6ac15e /nixpkgs/default.nix | |
parent | 186d5cc95a7430136da3107734409511c64d7080 (diff) | |
parent | 1a5a3c0cf2aba173772765c24a0865bb2da6b691 (diff) |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'nixpkgs/default.nix')
-rw-r--r-- | nixpkgs/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nixpkgs/default.nix b/nixpkgs/default.nix new file mode 100644 index 000000000..92da82c35 --- /dev/null +++ b/nixpkgs/default.nix @@ -0,0 +1 @@ +import <upstream-nixpkgs> |