From 1f579be16663733bc9e1a1b40170c69c37164a10 Mon Sep 17 00:00:00 2001 From: dadada Date: Thu, 25 May 2023 16:52:10 +0200 Subject: [PATCH] flake: activate formatter --- .github/workflows/test.yml | 1 + flake.nix | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 50cb9a8..ee724de 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,3 +24,4 @@ jobs: signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - run: nix flake check + - run: nix develop -c gofmt -d -e . diff --git a/flake.nix b/flake.nix index c859555..c0439ad 100644 --- a/flake.nix +++ b/flake.nix @@ -5,12 +5,21 @@ outputs = { self, nixpkgs, flake-utils }: flake-utils.lib.eachDefaultSystem (system: - let pkgs = nixpkgs.legacyPackages.${system}; in + let + pkgs = import nixpkgs { inherit system; }; + in rec { + formatter = pkgs.nixpkgs-fmt; + packages = flake-utils.lib.flattenTree { pad-archiver = pkgs.callPackage ./nix { pkgs = pkgs; }; gitAndTools = pkgs.gitAndTools; }; + + checks = { + nix-format = pkgs.runCommand "nix-format" { buildInputs = [ formatter ]; } "nixpkgs-fmt --check ${./.} && touch $out"; + }; + defaultPackage = packages.pad-archiver; apps.pad-archiver = flake-utils.lib.mkApp { drv = packages.pad-archiver; }; defaultApp = apps.pad-archiver;