Merge branch 'master' into staging

2017-06-22 00:41:25 +02:00
parent 29a485a8cd dd3f2e648a
commit 6338c50a84
696 changed files with 9477 additions and 7279 deletions
@@ -18,7 +18,7 @@ python2Packages.buildPythonApplication rec {
  meta = {
    description = "CLI tool for the Amazon Route 53 DNS service";
    homepage = https://github.com/barnybug/cli53;
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ benley ];
+    license = licenses.mit;
+    maintainers = with maintainers; [ benley ];
  };
 }
@@ -0,0 +1,3 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.0
+[
+]