Merge branch 'master' into staging-next

2021-01-24 20:41:42 +01:00
parent 09e2990117 27955d37e9
commit cc8fd11ffb
631 changed files with 2683 additions and 2201 deletions
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -162,7 +162,7 @@ let

    postFixup = lib.optionalString (!dontWrapPythonPrograms) ''
      wrapPythonPrograms
-    '' + attrs.postFixup or '''';
+    '' + attrs.postFixup or "";

    # Python packages built through cross-compilation are always for the host platform.
    disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonForBuild ];