Merge staging-next into staging

2021-01-10 18:41:46 +00:00
parent bfb627d78f 76394e4624
commit bd9e17e21f
40 changed files with 7625 additions and 6536 deletions
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -24,7 +24,7 @@ with pkgs;
      pythonPackages = callPackage
        ({ pkgs, stdenv, python, overrides }: let
          pythonPackagesFun = import ../../../top-level/python-packages.nix {
-            inherit stdenv pkgs;
+            inherit stdenv pkgs lib;
            python = self;
          };
          otherSplices = {