chore: format nix using alejandra

default.nix

@@ -1,10 +1,14 @@
-(import
 (
-    let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in
+  import
+  (
+    let
+      lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+    in
       fetchTarball {
         url = lock.nodes.flake-compat.locked.url or "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
         sha256 = lock.nodes.flake-compat.locked.narHash;
       }
   )
   {src = ./.;}
-).defaultNix
+)
+.defaultNix

engage.toml

@@ -35,6 +35,11 @@ group = "versions"
 name = "lychee"
 script = "lychee --version"
 
+[[task]]
+group = "versions"
+name = "alejandra"
+script = "alejandra --version"
+
 [[task]]
 group = "lints"
 name = "cargo-fmt"
@@ -66,6 +71,11 @@ group = "lints"
 name = "lychee"
 script = "lychee --offline docs"
 
+[[task]]
+group = "lints"
+name = "alejandra"
+script = "alejandra --check ."
+
 [[task]]
 group = "tests"
 name = "cargo"

flake.nix

@@ -19,10 +19,10 @@
     attic.url = "github:zhaofengli/attic?ref=main";
   };
 
-  outputs = inputs:
+  outputs = inputs: let
-    let
     # Keep sorted
-      mkScope = pkgs: pkgs.lib.makeScope pkgs.newScope (self: {
+    mkScope = pkgs:
+      pkgs.lib.makeScope pkgs.newScope (self: {
         craneLib =
           (inputs.crane.mkLib pkgs).overrideToolchain self.toolchain;
 
@@ -34,8 +34,7 @@
 
         book = self.callPackage ./nix/pkgs/book {};
 
-        rocksdb =
+        rocksdb = let
-        let
           version = "9.1.1";
         in
           pkgs.rocksdb.overrideAttrs (old: {
@@ -51,7 +50,8 @@
         shell = self.callPackage ./nix/shell.nix {};
 
         # The Rust toolchain to use
-        toolchain = inputs
+        toolchain =
+          inputs
           .fenix
           .packages
           .${pkgs.pkgsBuildHost.system}
@@ -63,22 +63,23 @@
           };
       });
   in
-    inputs.flake-utils.lib.eachDefaultSystem (system:
+    inputs.flake-utils.lib.eachDefaultSystem (
-      let
+      system: let
         pkgs = inputs.nixpkgs.legacyPackages.${system};
-      in
+      in {
+        packages =
           {
-        packages = {
             default = (mkScope pkgs).default;
             oci-image = (mkScope pkgs).oci-image;
             book = (mkScope pkgs).book;
           }
-        //
+          // builtins.listToAttrs
-        builtins.listToAttrs
+          (
-          (builtins.concatLists
+            builtins.concatLists
-            (builtins.map
+            (
-              (crossSystem:
+              builtins.map
-                let
+              (
+                crossSystem: let
                   binaryName = "static-${crossSystem}";
                   pkgsCrossStatic =
                     (import inputs.nixpkgs {
@@ -86,9 +87,9 @@
                       crossSystem = {
                         config = crossSystem;
                       };
-                    }).pkgsStatic;
+                    })
-                in
+                    .pkgsStatic;
-                [
+                in [
                   # An output for a statically-linked binary
                   {
                     name = binaryName;

nix/pkgs/book/default.nix

@@ -1,16 +1,18 @@
 # Keep sorted
-{ default
+{
-, inputs
+  default,
-, mdbook
+  inputs,
-, stdenv
+  mdbook,
+  stdenv,
 }:
-
 stdenv.mkDerivation {
   pname = "${default.pname}-book";
   version = default.version;
 
-
+  src = let
-  src = let filter = inputs.nix-filter.lib; in filter {
+    filter = inputs.nix-filter.lib;
+  in
+    filter {
       root = inputs.self;
 
       # Keep sorted

nix/pkgs/default/cross-compilation-env.nix

@@ -1,18 +1,18 @@
-{ lib
+{
-, pkgsBuildHost
+  lib,
-, rust
+  pkgsBuildHost,
-, stdenv
+  rust,
+  stdenv,
 }:
-
 lib.optionalAttrs stdenv.hostPlatform.isStatic {
   ROCKSDB_STATIC = "";
 }
-//
+// {
-{
   CARGO_BUILD_RUSTFLAGS =
     lib.concatStringsSep
     " "
-      ([]
+    (
+      []
       # This disables PIE for static builds, which isn't great in terms of
       # security. Unfortunately, my hand is forced because nixpkgs'
       # `libstdc++.a` is built without `-fPIE`, which precludes us from
@@ -46,15 +46,13 @@ lib.optionalAttrs stdenv.hostPlatform.isStatic {
       ]
     );
 }
-
 # What follows is stolen from [here][0]. Its purpose is to properly configure
 # compilers and linkers for various stages of the build, and even covers the
 # case of build scripts that need native code compiled and run on the build
 # platform (I think).
 #
 # [0]: https://github.com/NixOS/nixpkgs/blob/5cdb38bb16c6d0a38779db14fcc766bc1b2394d6/pkgs/build-support/rust/lib/default.nix#L57-L80
-//
+// (
-(
   let
     inherit (rust.lib) envVars;
   in
@@ -64,32 +62,27 @@ lib.optionalAttrs stdenv.hostPlatform.isStatic {
     (
       let
         inherit (stdenv.targetPlatform.rust) cargoEnvVarTarget;
-      in
+      in {
-      {
         "CC_${cargoEnvVarTarget}" = envVars.ccForTarget;
         "CXX_${cargoEnvVarTarget}" = envVars.cxxForTarget;
         "CARGO_TARGET_${cargoEnvVarTarget}_LINKER" =
           envVars.linkerForTarget;
       }
     )
-  //
+    // (
-  (
       let
         inherit (stdenv.hostPlatform.rust) cargoEnvVarTarget rustcTarget;
-    in
+      in {
-    {
         "CC_${cargoEnvVarTarget}" = envVars.ccForHost;
         "CXX_${cargoEnvVarTarget}" = envVars.cxxForHost;
         "CARGO_TARGET_${cargoEnvVarTarget}_LINKER" = envVars.linkerForHost;
         CARGO_BUILD_TARGET = rustcTarget;
       }
     )
-  //
+    // (
-  (
       let
         inherit (stdenv.buildPlatform.rust) cargoEnvVarTarget;
-    in
+      in {
-    {
         "CC_${cargoEnvVarTarget}" = envVars.ccForBuild;
         "CXX_${cargoEnvVarTarget}" = envVars.cxxForBuild;
         "CARGO_TARGET_${cargoEnvVarTarget}_LINKER" = envVars.linkerForBuild;

nix/pkgs/default/default.nix

@@ -1,21 +1,18 @@
 # Dependencies (keep sorted)
-{ craneLib
+{
-, inputs
+  craneLib,
-, lib
+  inputs,
-, pkgsBuildHost
+  lib,
-, rocksdb
+  pkgsBuildHost,
-, rust
+  rocksdb,
-, stdenv
+  rust,
-
+  stdenv,
   # Options (keep sorted)
-, default-features ? true
+  default-features ? true,
-, features ? []
+  features ? [],
-, profile ? "release"
+  profile ? "release",
-}:
+}: let
-
+  buildDepsOnlyEnv = let
-let
-  buildDepsOnlyEnv =
-    let
     rocksdb' = rocksdb.override {
       enableJemalloc = builtins.elem "jemalloc" features;
     };
@@ -25,19 +22,21 @@ let
       ROCKSDB_INCLUDE_DIR = "${rocksdb'}/include";
       ROCKSDB_LIB_DIR = "${rocksdb'}/lib";
     }
-    //
+    // (import ./cross-compilation-env.nix {
-    (import ./cross-compilation-env.nix {
       # Keep sorted
       inherit
         lib
         pkgsBuildHost
         rust
-        stdenv;
+        stdenv
+        ;
     });
 
-  buildPackageEnv = {
+  buildPackageEnv =
+    {
       CONDUIT_VERSION_EXTRA = inputs.self.shortRev or inputs.self.dirtyShortRev;
-  } // buildDepsOnlyEnv;
+    }
+    // buildDepsOnlyEnv;
 
   commonAttrs = {
     inherit
@@ -45,9 +44,13 @@ let
         cargoToml = "${inputs.self}/Cargo.toml";
       })
       pname
-      version;
+      version
+      ;
 
-    src = let filter = inputs.nix-filter.lib; in filter {
+    src = let
+      filter = inputs.nix-filter.lib;
+    in
+      filter {
         root = inputs.self;
 
         # Keep sorted
@@ -68,19 +71,22 @@ let
     CARGO_PROFILE = profile;
   };
 in
-
+  craneLib.buildPackage (commonAttrs
-craneLib.buildPackage ( commonAttrs // {
+    // {
-  cargoArtifacts = craneLib.buildDepsOnly (commonAttrs // {
+      cargoArtifacts = craneLib.buildDepsOnly (commonAttrs
+        // {
           env = buildDepsOnlyEnv;
         });
 
-  cargoExtraArgs = "--locked "
+      cargoExtraArgs =
+        "--locked "
         + lib.optionalString
         (!default-features)
         "--no-default-features "
         + lib.optionalString
         (features != [])
-      "--features " + (builtins.concatStringsSep "," features);
+        "--features "
+        + (builtins.concatStringsSep "," features);
 
       # This is redundant with CI
       doCheck = false;

nix/pkgs/oci-image/default.nix

@@ -1,10 +1,10 @@
 # Keep sorted
-{ default
+{
-, dockerTools
+  default,
-, lib
+  dockerTools,
-, tini
+  lib,
+  tini,
 }:
-
 dockerTools.buildImage {
   name = default.pname;
   tag = "next";

nix/shell.nix

@@ -1,21 +1,24 @@
 # Keep sorted
-{ cargo-deb
+{
-, default
+  alejandra,
-, engage
+  cargo-deb,
-, go
+  default,
-, inputs
+  engage,
-, jq
+  go,
-, lychee
+  inputs,
-, mdbook
+  jq,
-, mkShell
+  lychee,
-, olm
+  mdbook,
-, system
+  mkShell,
-, taplo
+  olm,
-, toolchain
+  system,
+  taplo,
+  toolchain,
 }:
-
 mkShell {
-  env = default.env // {
+  env =
+    default.env
+    // {
       # Rust Analyzer needs to be able to find the path to default crate
       # sources, and it can read this environment variable to do so. The
       # `rust-src` component is required in order for this to work.
@@ -23,7 +26,9 @@ mkShell {
     };
 
   # Development tools
-  nativeBuildInputs = default.nativeBuildInputs ++ [
+  nativeBuildInputs =
+    default.nativeBuildInputs
+    ++ [
       # Always use nightly rustfmt because most of its options are unstable
       #
       # This needs to come before `toolchain` in this list, otherwise
@@ -57,5 +62,8 @@ mkShell {
 
       # Useful for editing the book locally
       mdbook
+
+      # nix formatter
+      alejandra
     ];
 }