Merge branch 'master' into staging-next

pkgs/development/libraries/sqlite/default.nix

@@ -56,12 +56,13 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     unzip
   ];
-  buildInputs =
-    [ zlib ]
-    ++ lib.optionals interactive [
-      readline
-      ncurses
-    ];
+  buildInputs = [
+    zlib
+  ]
+  ++ lib.optionals interactive [
+    readline
+    ncurses
+  ];
 
   # required for aarch64 but applied for all arches for simplicity
   preConfigure = ''
@@ -73,16 +74,15 @@ stdenv.mkDerivation rec {
   # on a per-output basis.
   setOutputFlags = false;
 
-  configureFlags =
-    [
-      "--bindir=${placeholder "bin"}/bin"
-      "--includedir=${placeholder "dev"}/include"
-      "--libdir=${placeholder "out"}/lib"
-    ]
-    ++ lib.optional (!interactive) "--disable-readline"
-    # autosetup only looks up readline.h in predefined set of directories.
-    ++ lib.optional interactive "--with-readline-header=${lib.getDev readline}/include/readline/readline.h"
-    ++ lib.optional (stdenv.hostPlatform.isStatic) "--disable-shared";
+  configureFlags = [
+    "--bindir=${placeholder "bin"}/bin"
+    "--includedir=${placeholder "dev"}/include"
+    "--libdir=${placeholder "out"}/lib"
+  ]
+  ++ lib.optional (!interactive) "--disable-readline"
+  # autosetup only looks up readline.h in predefined set of directories.
+  ++ lib.optional interactive "--with-readline-header=${lib.getDev readline}/include/readline/readline.h"
+  ++ lib.optional (stdenv.hostPlatform.isStatic) "--disable-shared";
 
   env.NIX_CFLAGS_COMPILE = toString [
     "-DSQLITE_ENABLE_COLUMN_METADATA"

pkgs/development/libraries/sqlite/sqlar.nix

@@ -26,15 +26,15 @@ stdenv.mkDerivation {
   buildFlags = [
     "CFLAGS=-Wno-error"
     "sqlar"
-  ] ++ lib.optional withFuse "sqlarfs";
+  ]
+  ++ lib.optional withFuse "sqlarfs";
 
-  installPhase =
-    ''
-      install -D -t $out/bin sqlar
-    ''
-    + lib.optionalString withFuse ''
-      install -D -t $out/bin sqlarfs
-    '';
+  installPhase = ''
+    install -D -t $out/bin sqlar
+  ''
+  + lib.optionalString withFuse ''
+    install -D -t $out/bin sqlarfs
+  '';
 
   meta = with lib; {
     homepage = "https://sqlite.org/sqlar";