From d593deaf38ac217df1b3c9f911621fb25c96a1f0 Mon Sep 17 00:00:00 2001 From: Pepe Iborra Date: Sat, 5 Dec 2020 07:03:34 +0000 Subject: [PATCH] Actually use gitignore --- nix/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/nix/default.nix b/nix/default.nix index ded4c02283..14e5e16905 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -12,18 +12,19 @@ let }); }; }; + gitignoreSource = (import sources.gitignore { inherit (pkgs) lib; }).gitignoreSource; extended = haskellPackages: haskellPackages.extend (pkgs.haskell.lib.packageSourceOverrides { - haskell-language-server = ../.; - ghcide = ../ghcide; - hie-compat = ../ghcide/hie-compat; - hls-plugin-api = ../hls-plugin-api; - hls-tactics-plugin = ../plugins/tactics; - hls-hlint-plugin = ../plugins/hls-hlint-plugin; + haskell-language-server = gitignoreSource ../.; + ghcide = gitignoreSource ../ghcide; + hie-compat = gitignoreSource ../ghcide/hie-compat; + hls-plugin-api = gitignoreSource ../hls-plugin-api; + hls-tactics-plugin = gitignoreSource ../plugins/tactics; + hls-hlint-plugin = gitignoreSource ../plugins/hls-hlint-plugin; }); in { - inherit (import sources.gitignore { inherit (pkgs) lib; }) gitignoreSource; + inherit gitignoreSource; ourHaskell = pkgs.haskell // { packages = pkgs.haskell.packages // { # relax upper bounds on ghc 8.10.x versions (and skip running tests)