From 99c4de6d6685602009d8d1789595bf822025c548 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Fri, 2 Oct 2020 17:15:46 +0200 Subject: [PATCH] Use nixpkgs-fmt hook from pre-commit-hooks.nix --- .gitignore | 3 ++- default.nix | 11 +++++++++++ pre-commit-hook | 2 -- shell.nix | 6 +++--- 4 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 default.nix delete mode 100755 pre-commit-hook diff --git a/.gitignore b/.gitignore index bc27100..ac53f35 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ -/result /*.qcow2 +/.pre-commit-config.yaml +/result diff --git a/default.nix b/default.nix new file mode 100644 index 0000000..fa8c463 --- /dev/null +++ b/default.nix @@ -0,0 +1,11 @@ +let + nix-pre-commit-hooks = import (builtins.fetchTarball "https://github.com/cachix/pre-commit-hooks.nix/tarball/master"); +in +{ + pre-commit-check = nix-pre-commit-hooks.run { + src = ./.; + hooks = { + nixpkgs-fmt.enable = true; + }; + }; +} diff --git a/pre-commit-hook b/pre-commit-hook deleted file mode 100755 index b7e7516..0000000 --- a/pre-commit-hook +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -nixpkgs-fmt --check . diff --git a/shell.nix b/shell.nix index 60f4829..5d14712 100644 --- a/shell.nix +++ b/shell.nix @@ -1,10 +1,10 @@ -{ pkgs ? import { } }: +{ pkgs ? import {} }: pkgs.mkShell { nativeBuildInputs = with pkgs; [ nixpkgs-fmt ]; - buildPhase = '' - ln -f -s ../../pre-commit-hook .git/hooks/pre-commit + shellHook = '' + ${(import ./default.nix).pre-commit-check.shellHook} ''; }