Merge branch 'staging-next' into staging

2019-03-10 08:05:27 +01:00
parent 8a08d7e7cc bf47162c26
commit 8d502fd425
540 changed files with 12743 additions and 3707 deletions
--- a/pkgs/development/interpreters/python/build-python-package-flit.nix
+++ b/pkgs/development/interpreters/python/build-python-package-flit.nix
@@ -7,7 +7,7 @@
 { ... } @ attrs:

 attrs // {
-  buildInputs = [ flit ];
+  nativeBuildInputs = [ flit ];
  buildPhase = attrs.buildPhase or ''
    runHook preBuild
    flit build --format wheel