From f57192b48399027e086ab3e00ed57305ac43ba10 Mon Sep 17 00:00:00 2001 From: Pepe Iborra Date: Thu, 29 Apr 2021 09:05:19 +0100 Subject: [PATCH] Drop the nix pre-commit-hook temporarily The pre-commit-hook wasn't pinned, so it has broken --- nix/default.nix | 13 +------------ shell.nix | 1 - 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/nix/default.nix b/nix/default.nix index 7e75682b8f..2e33227fe1 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -1,6 +1,5 @@ { sources ? import ./sources.nix }: let - nix-pre-commit-hooks = (import (builtins.fetchTarball "https://github.com/cachix/pre-commit-hooks.nix/tarball/master/" + "/nix/") { sources = sources; }).packages; overlay = _self: pkgs: let sharedOverrides = { @@ -78,14 +77,4 @@ in (import sources.nixpkgs { overlays = [ overlay ]; config = {allowBroken = true;}; - }) // { - pre-commit-check = nix-pre-commit-hooks.run { - src = ./.; - # If your hooks are intrusive, avoid running on each commit with a default_states like this: - # default_stages = ["manual" "push"]; - hooks = { - stylish-haskell.enable = true; - stylish-haskell.excludes = [ "^Setup.hs$" "test/testdata/.*$" "test/data/.*$" "^hie-compat/.*$" "^plugins/hls-tactics-plugin/.*$" ]; - }; - }; - } + }) diff --git a/shell.nix b/shell.nix index 0ef0ad57fa..24f75fec09 100644 --- a/shell.nix +++ b/shell.nix @@ -51,6 +51,5 @@ haskellPackagesForProject.shellFor { export LD_LIBRARY_PATH=${gmp}/lib:${zlib}/lib:${ncurses}/lib:${capstone}/lib export DYLD_LIBRARY_PATH=${gmp}/lib:${zlib}/lib:${ncurses}/lib:${capstone}/lib export PATH=$PATH:$HOME/.local/bin - ${pre-commit-check.shellHook} ''; }