Merge staging-next into staging

2023-02-15 06:01:44 +00:00
parent cbb55edc46 1fd20e8410
commit c4fe2133de
46 changed files with 574 additions and 342 deletions
@@ -63,7 +63,7 @@
          hooks = import ./hooks/default.nix;
          keep = lib.extends hooks pythonPackagesFun;
          extra = _: {};
-          optionalExtensions = cond: as: if cond then as else [];
+          optionalExtensions = cond: as: lib.optionals cond as;
          pythonExtension = import ../../../top-level/python-packages.nix;
          python2Extension = import ../../../top-level/python2-packages.nix;
          extensions = lib.composeManyExtensions ([