Merge branch 'balsoft/gitignore' into 'dev'

Improve nix gitignore

See merge request ligolang/ligo!667
This commit is contained in:
Suzanne Dupéron 2020-06-08 17:11:43 +00:00
commit 206f52d8e6
2 changed files with 5 additions and 2 deletions

2
.gitignore vendored
View File

@ -3,6 +3,8 @@
*.merlin *.merlin
cache/* cache/*
Version.ml Version.ml
/result
/result-*
/_opam/ /_opam/
/*.pp.ligo /*.pp.ligo
/*.pp.mligo /*.pp.mligo

View File

@ -9,11 +9,12 @@ let
inherit (import sources."gitignore.nix" { inherit (self) lib; }) inherit (import sources."gitignore.nix" { inherit (self) lib; })
gitignoreSource; gitignoreSource;
# Remove list of directories or files from source (to stop unneeded rebuilds) # Remove list of directories or files from source (to stop unneeded rebuilds)
# Also, apply the gitignore here.
filterOut = xs: filterOut = xs:
self.lib.cleanSourceWith { gitignoreSource (self.lib.cleanSourceWith {
filter = p: type: !(builtins.elem (builtins.baseNameOf p) xs); filter = p: type: !(builtins.elem (builtins.baseNameOf p) xs);
src = gitignoreSource ../.; src = gitignoreSource ../.;
}; });
in { in {
ocamlPackages = self.ocaml-ng.ocamlPackages_4_07.overrideScope' ocamlPackages = self.ocaml-ng.ocamlPackages_4_07.overrideScope'
(builtins.foldl' self.lib.composeExtensions (_: _: { }) [ (builtins.foldl' self.lib.composeExtensions (_: _: { }) [