From b970e250217d970060a211022852d863e34060aa Mon Sep 17 00:00:00 2001 From: Sandy Maguire Date: Fri, 25 Jun 2021 13:21:58 -0700 Subject: [PATCH] Enable hyphenation embedding (#1979) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- cabal.project | 4 +++- stack-8.10.2.yaml | 2 ++ stack-8.10.3.yaml | 3 +++ stack-8.10.4.yaml | 3 +++ stack-8.10.5.yaml | 3 +++ stack-8.6.4.yaml | 3 +++ stack-8.6.5.yaml | 2 ++ stack-8.8.3.yaml | 3 +++ stack-8.8.4.yaml | 2 ++ stack-9.0.1.yaml | 2 ++ 10 files changed, 26 insertions(+), 1 deletion(-) diff --git a/cabal.project b/cabal.project index b7a893cceb..725ffaba0f 100644 --- a/cabal.project +++ b/cabal.project @@ -40,7 +40,9 @@ index-state: 2021-06-21T19:57:32Z constraints: -- Diagrams doesn't support optparse-applicative >= 0.16 yet - optparse-applicative < 0.16 + optparse-applicative < 0.16, + hyphenation +embed + allow-newer: active:base, diff --git a/stack-8.10.2.yaml b/stack-8.10.2.yaml index ce833e756a..a08969c501 100644 --- a/stack-8.10.2.yaml +++ b/stack-8.10.2.yaml @@ -84,6 +84,8 @@ flags: # Until the formatters support ghc-lib-9, we need this flag disabled hls-hlint-plugin: hlint33: false + hyphenation: + embed: true nix: packages: [icu libcxx zlib] diff --git a/stack-8.10.3.yaml b/stack-8.10.3.yaml index 250c3c0d31..494fbc9f14 100644 --- a/stack-8.10.3.yaml +++ b/stack-8.10.3.yaml @@ -84,6 +84,9 @@ flags: # Until the formatters support ghc-lib-9, we need this flag disabled hls-hlint-plugin: hlint33: false + hyphenation: + embed: true + nix: packages: [ icu libcxx zlib ] diff --git a/stack-8.10.4.yaml b/stack-8.10.4.yaml index bcfad67469..7d68446b0d 100644 --- a/stack-8.10.4.yaml +++ b/stack-8.10.4.yaml @@ -86,6 +86,9 @@ flags: # Until the formatters support ghc-lib-9, we need this flag disabled hls-hlint-plugin: hlint33: false + hyphenation: + embed: true + nix: packages: [ icu libcxx zlib ] diff --git a/stack-8.10.5.yaml b/stack-8.10.5.yaml index 094d96c1d2..be4b94326c 100644 --- a/stack-8.10.5.yaml +++ b/stack-8.10.5.yaml @@ -88,6 +88,9 @@ flags: # Until the formatters support ghc-lib-9, we need this flag disabled hls-hlint-plugin: hlint33: false + hyphenation: + embed: true + # Because of implicit-hie-cradle-0.3.0.2 and stylish-haskell-0.12.2.0 allow-newer: true diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml index 548297d594..87f44fc423 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -113,6 +113,9 @@ flags: # Stack doesn't support automatic flags. hls-hlint-plugin: hlint33: false + hyphenation: + embed: true + configure-options: ghcide: diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index 44c8193f32..024f6f006a 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -122,6 +122,8 @@ flags: # Stack doesn't support automatic flags. hls-hlint-plugin: hlint33: false + hyphenation: + embed: true nix: packages: [icu libcxx zlib] diff --git a/stack-8.8.3.yaml b/stack-8.8.3.yaml index 3788c4d617..34ff2743dd 100644 --- a/stack-8.8.3.yaml +++ b/stack-8.8.3.yaml @@ -101,6 +101,9 @@ flags: # Until the formatters support ghc-lib-9, we need this flag disabled hls-hlint-plugin: hlint33: false + hyphenation: + embed: true + nix: packages: [icu libcxx zlib] diff --git a/stack-8.8.4.yaml b/stack-8.8.4.yaml index 9fb15da735..6b3e7a7a97 100644 --- a/stack-8.8.4.yaml +++ b/stack-8.8.4.yaml @@ -98,6 +98,8 @@ flags: # Until the formatters support ghc-lib-9, we need this flag disabled hls-hlint-plugin: hlint33: false + hyphenation: + embed: true nix: packages: [icu libcxx zlib] diff --git a/stack-9.0.1.yaml b/stack-9.0.1.yaml index 086bd185d8..8bbafb7e56 100644 --- a/stack-9.0.1.yaml +++ b/stack-9.0.1.yaml @@ -124,6 +124,8 @@ flags: # Stack doesn't support automatic flags. hls-hlint-plugin: hlint33: true + hyphenation: + embed: true nix: packages: [ icu libcxx zlib ]