Merge master into staging-next

2020-10-13 19:34:34 +02:00
parent aabcf2d8f5 c5a41da563
commit 9e1943edc0
210 changed files with 11913 additions and 8961 deletions
@@ -23,6 +23,7 @@ python3.pkgs.buildPythonApplication rec {
    agate-dbf
    agate-sql
    six
+    setuptools  # `csvsql` requires pkg_resources https://github.com/NixOS/nixpkgs/issues/93594
  ];

  checkInputs = with python3.pkgs; [