Merge pull request 'Report available disk space in `garage stats`' (#487) from report-disk-usage into main

Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/487

1 files changed, 16 insertions, 22 deletions

diff --git a/nix/toolchain.nix b/nix/toolchain.nix
index 079fcf13..532db74e 100644
--- a/nix/toolchain.nix
+++ b/nix/toolchain.nix
@@ -1,6 +1,4 @@
-{
-  system ? builtins.currentSystem,
-}:
+{ system ? builtins.currentSystem, }:
 
 with import ./common.nix;
 
@@ -11,27 +9,23 @@ let
     #"aarch64-unknown-linux-musl"
     "armv6l-unknown-linux-musleabihf"
   ];
-  pkgsList = builtins.map (target: import pkgsSrc { 
-    inherit system; 
-    crossSystem = {
-      config = target;
-      isStatic = true;
-    };
-    overlays = [ cargo2nixOverlay ];
-  }) platforms;
-  pkgsHost = import pkgsSrc {};
+  pkgsList = builtins.map (target:
+    import pkgsSrc {
+      inherit system;
+      crossSystem = {
+        config = target;
+        isStatic = true;
+      };
+      overlays = [ cargo2nixOverlay ];
+    }) platforms;
+  pkgsHost = import pkgsSrc { };
   lib = pkgsHost.lib;
   kaniko = (import ./kaniko.nix) pkgsHost;
   winscp = (import ./winscp.nix) pkgsHost;
   manifestTool = (import ./manifest-tool.nix) pkgsHost;
-in 
-  lib.flatten (builtins.map (pkgs: [
-     pkgs.rustPlatform.rust.rustc
-     pkgs.rustPlatform.rust.cargo
-     pkgs.buildPackages.stdenv.cc
-  ]) pkgsList) ++ [
-    kaniko
-    winscp
-    manifestTool
-  ]
+in lib.flatten (builtins.map (pkgs: [
+  pkgs.rustPlatform.rust.rustc
+  pkgs.rustPlatform.rust.cargo
+  pkgs.buildPackages.stdenv.cc
+]) pkgsList) ++ [ kaniko winscp manifestTool ]