Merge master into staging-next

2019-08-18 12:53:44 +02:00
parent b8a79ac677 ffbb4d26f9
commit f65aa21bb2
125 changed files with 3217 additions and 885 deletions
@@ -29,6 +29,6 @@ pythonPackages.buildPythonApplication rec {
    homepage = https://github.com/eliangcs/http-prompt;
    license = licenses.mit;
    maintainers = with maintainers; [ matthiasbeyer ];
-    platforms = platforms.linux; # can only test on linux
+    platforms = platforms.linux ++ platforms.darwin;
  };
 }