Merge staging-next into staging

Conflicts: pkgs/development/libraries/sqlite/default.nix
2022-03-01 16:20:52 +10:00
parent ae747bc007 3135db28cb
commit 64a89aac86
112 changed files with 1398 additions and 553 deletions
@@ -10,7 +10,7 @@ let
 in

 stdenv.mkDerivation rec {
-  pname = "sqlite";
+  pname = "sqlite${optionalString interactive "-interactive"}";
  version = "3.38.0";

  # nixpkgs-update: no auto update