fix

Author: HuangYi

.github/workflows/lint.yml

@@ -102,5 +102,5 @@ jobs:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
         if: steps.changed-files.outputs.any_changed == 'true'
-      - run: nix-shell -I nixpkgs=./nix -p nixfmt --run "make lint-nix"
+      - run: nix-shell -I nixpkgs=./nix -p nixfmt-rfc-style --run "make lint-nix"
         if: steps.changed-files.outputs.any_changed == 'true'

flake.nix

@@ -62,6 +62,7 @@
             buildInputs = [
               defaultPackage.go
               pkgs.gomod2nix
+              pkgs.nixfmt-rfc-style
             ];
           };
           rocksdb = pkgs.mkShell {
@@ -70,11 +71,7 @@
               pkgs.rocksdb.tools
             ];
           };
-          full = pkgs.mkShell {
-            buildInputs = rocksdb.buildInputs ++ [
-              pkgs.test-env
-            ];
-          };
+          full = pkgs.mkShell { buildInputs = rocksdb.buildInputs ++ [ pkgs.test-env ]; };
         };
         legacyPackages = pkgs;
       }

integration_tests/configs/broken-cronosd.nix

@@ -5,7 +5,5 @@ let
   cronosd = (pkgs.callPackage ../../. { });
 in
 cronosd.overrideAttrs (oldAttrs: {
-  patches = oldAttrs.patches or [ ] ++ [
-    ./broken-cronosd.patch
-  ];
+  patches = oldAttrs.patches or [ ] ++ [ ./broken-cronosd.patch ];
 })

integration_tests/shell.nix

@@ -21,7 +21,7 @@ pkgs.mkShell {
     (renameExe pkgs.solc-static-versions.solc_0_6_8 "solc-0.6.8" "solc06")
     (renameExe pkgs.solc-static-versions.solc_0_8_21 "solc-0.8.21" "solc08")
     pkgs.test-env
-    pkgs.nixfmt
+    pkgs.nixfmt-rfc-style
     pkgs.rocksdb
     pkgs.chain-maind
     pkgs.hermes

nix/cosmovisor.nix

@@ -1,7 +1,4 @@
-{
-  buildGoModule,
-  fetchFromGitHub,
-}:
+{ buildGoModule, fetchFromGitHub }:
 
 let
   version = "1.5.0";

nix/cronos-matrix.nix

@@ -48,9 +48,7 @@ builtins.listToAttrs (
       );
       value =
         let
-          cronosd = callPackage ../. {
-            inherit rev network;
-          };
+          cronosd = callPackage ../. { inherit rev network; };
           bundle = if stdenv.hostPlatform.isWindows then bundle-win-exe cronosd else bundle-exe cronosd;
         in
         if pkgtype == "bundle" then

nix/dapptools-overlay.nix

@@ -10,9 +10,7 @@ let
   dapptools-patched = self.srcOnly {
     name = "dapptools-patched";
     src = dapptools-master;
-    patches = [
-      ./dapptools.patch
-    ];
+    patches = [ ./dapptools.patch ];
   };
 in
 {

nix/default.nix

@@ -63,9 +63,7 @@ import sources.nixpkgs {
       hermes = pkgs.callPackage ./hermes.nix { src = sources.ibc-rs; };
     })
     (_: pkgs: { test-env = pkgs.callPackage ./testenv.nix { }; })
-    (_: pkgs: {
-      cosmovisor = pkgs.callPackage ./cosmovisor.nix { };
-    })
+    (_: pkgs: { cosmovisor = pkgs.callPackage ./cosmovisor.nix { }; })
     (_: pkgs: {
       rly = pkgs.buildGo121Module rec {
         name = "rly";

nix/rocksdb.nix

@@ -52,11 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     "tools"
   ];
 
-  env.NIX_CFLAGS_COMPILE = toString (
-    lib.optionals stdenv.cc.isClang [
-      "-faligned-allocation"
-    ]
-  );
+  env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ "-faligned-allocation" ]);
 
   cmakeFlags = [
     "-DPORTABLE=1"

nix/testground-image.nix

@@ -6,9 +6,7 @@
 }:
 let
   patched-cronosd = cronos-matrix.cronosd.overrideAttrs (oldAttrs: {
-    patches = oldAttrs.patches or [ ] ++ [
-      ./testground-cronosd.patch
-    ];
+    patches = oldAttrs.patches or [ ] ++ [ ./testground-cronosd.patch ];
   });
 in
 let
@@ -36,8 +34,6 @@ dockerTools.buildLayeredImage {
       30000
     ];
     Cmd = [ "/bin/stateless-testcase" ];
-    Env = [
-      "PYTHONUNBUFFERED=1"
-    ];
+    Env = [ "PYTHONUNBUFFERED=1" ];
   };
 }