Merge master into staging-next

2022-06-16 23:27:22 +00:00
parent 1b3f8ec8e4 1829c5b002
commit ccdd0f7af6
127 changed files with 2576 additions and 2493 deletions
@@ -82,7 +82,7 @@ let

  passthru = let
    # When we override the interpreter we also need to override the spliced versions of the interpreter
-    inputs' = lib.filterAttrs (_: v: ! lib.isDerivation v) inputs;
+    inputs' = lib.filterAttrs (n: v: ! lib.isDerivation v && n != "passthruFun") inputs;
    override = attr: let python = attr.override (inputs' // { self = python; }); in python;
  in passthruFun rec {
    inherit self sourceVersion packageOverrides;