From 878e098be0654c668f2fbf9f2ebf12ec57354e5c Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Thu, 20 Feb 2025 16:37:49 +0000 Subject: refactor: run nixfmt format the nix code with nixfmt --- flake.nix | 54 ++++++++++++++++++++++++++---------------------------- shell.nix | 3 ++- 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/flake.nix b/flake.nix index 5c062c9..ff528e5 100644 --- a/flake.nix +++ b/flake.nix @@ -9,13 +9,9 @@ flake-utils.lib.eachDefaultSystem (system: let overlays = [ (import rust-overlay) ]; - pkgs = import nixpkgs { - inherit system overlays; - }; + pkgs = import nixpkgs { inherit system overlays; }; manifest = pkgs.lib.importTOML ./Cargo.toml; - in - with pkgs; - { + in with pkgs; { devShells.default = mkShell { nativeBuildInputs = [ @@ -45,34 +41,36 @@ }; # Create packages for each binary defined in Cargo.toml packages.default = pkgs.rustPlatform.buildRustPackage { - pname = manifest.package.name; - version = manifest.package.version; - src = ./.; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "rexpect-0.5.0" = "0amxyp81r90gfqlx5dnfjsmd403kf5hcw0crzpcmsbaviavxff4y"; - "simple-websockets-0.1.6" = "0910bbl7p3by18w3wks8gbgdg8879hn2c39z1bkr5pcvfkcxmaf3"; - }; + pname = manifest.package.name; + version = manifest.package.version; + src = ./.; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "rexpect-0.5.0" = + "0amxyp81r90gfqlx5dnfjsmd403kf5hcw0crzpcmsbaviavxff4y"; + "simple-websockets-0.1.6" = + "0910bbl7p3by18w3wks8gbgdg8879hn2c39z1bkr5pcvfkcxmaf3"; }; - buildInputs = [ - pkg-config # required by git2 - openssl - ]; - nativeBuildInputs = [ - pkg-config # required by git2 - openssl - ]; - doCheck = false; }; + buildInputs = [ + pkg-config # required by git2 + openssl + ]; + nativeBuildInputs = [ + pkg-config # required by git2 + openssl + ]; + doCheck = false; + }; # Create a tarball for the built package packages.tarball = stdenv.mkDerivation { - name = "${manifest.package.name}-${manifest.package.version}-${system}.tar.gz"; + name = + "${manifest.package.name}-${manifest.package.version}-${system}.tar.gz"; buildInputs = [ coreutils ]; buildPhase = '' tar -czf $out/${manifest.package.name}-${manifest.package.version}-${system}.tar.gz -C $out . ''; }; - } - ); -} \ No newline at end of file + }); +} diff --git a/shell.nix b/shell.nix index 8745f50..0f9438a 100644 --- a/shell.nix +++ b/shell.nix @@ -1 +1,2 @@ -(builtins.getFlake ("git+file://" + toString ./.)).devShells.${builtins.currentSystem}.default +(builtins.getFlake + ("git+file://" + toString ./.)).devShells.${builtins.currentSystem}.default -- cgit v1.2.3