Merge staging-next into master

2018-07-17 10:04:59 +02:00
parent bac995cd9f 9d0336a2bb
commit 1ae2f10642
77 changed files with 496 additions and 453 deletions
--- a/pkgs/tools/graphics/luxcorerender/default.nix
+++ b/pkgs/tools/graphics/luxcorerender/default.nix
@@ -10,6 +10,7 @@
 let boost_static = boost165.override {
      python = python35;
      enableStatic = true;
+      enablePython = true;
    };

 in stdenv.mkDerivation rec {