Skip to content

Commit

Permalink
Merge branch 'issue-1216'
Browse files Browse the repository at this point in the history
  • Loading branch information
hasufell committed Jan 18, 2025
2 parents d94ce2a + c25a067 commit 03e7986
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 17 deletions.
28 changes: 11 additions & 17 deletions ghcup.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,14 @@ flag yaml-streamly
default: False
manual: True

common common-ghc-options
ghc-options:
-Wall -fwarn-tabs -fwarn-incomplete-uni-patterns
-fwarn-incomplete-record-updates -Werror=incomplete-patterns

common app-common-depends
import: common-ghc-options

build-depends:
, aeson >=1.4
, aeson-pretty ^>=0.8.8
Expand Down Expand Up @@ -197,10 +204,6 @@ library
TypeFamilies
ViewPatterns

ghc-options:
-Wall -fwarn-tabs -fwarn-incomplete-uni-patterns
-fwarn-incomplete-record-updates

build-depends:
, aeson >=1.4
, async >=0.8 && <2.3
Expand Down Expand Up @@ -350,10 +353,6 @@ library ghcup-optparse
StrictData
TupleSections

ghc-options:
-Wall -fwarn-tabs -fwarn-incomplete-uni-patterns
-fwarn-incomplete-record-updates

build-depends: ghcup

if flag(internal-downloader)
Expand Down Expand Up @@ -399,10 +398,6 @@ library ghcup-tui
StrictData
TupleSections

ghc-options:
-Wall -fwarn-tabs -fwarn-incomplete-uni-patterns
-fwarn-incomplete-record-updates

build-depends:
, ghcup
, brick >=2.1 && <2.8
Expand Down Expand Up @@ -434,8 +429,7 @@ executable ghcup
TupleSections

ghc-options:
-Wall -fwarn-tabs -fwarn-incomplete-uni-patterns
-fwarn-incomplete-record-updates -threaded
-threaded

build-depends:
, ghcup
Expand All @@ -459,6 +453,7 @@ executable ghcup
buildable: False

test-suite ghcup-test
import: common-ghc-options
type: exitcode-stdio-1.0
main-is: Main.hs
build-tool-depends: hspec-discover:hspec-discover -any
Expand All @@ -481,8 +476,7 @@ test-suite ghcup-test
TupleSections

ghc-options:
-Wall -fwarn-tabs -fwarn-incomplete-uni-patterns
-fwarn-incomplete-record-updates -fconstraint-solver-iterations=0
-fconstraint-solver-iterations=0

build-depends:
, base >=4.12 && <5
Expand Down Expand Up @@ -510,6 +504,7 @@ test-suite ghcup-test
build-depends: unix ^>=2.7 || ^>=2.8

test-suite ghcup-optparse-test
import: common-ghc-options
type: exitcode-stdio-1.0
hs-source-dirs: test/optparse-test
main-is: Main.hs
Expand All @@ -533,7 +528,6 @@ test-suite ghcup-optparse-test
cpp-options: -DIS_WINDOWS

default-language: Haskell2010
ghc-options: -Wall
build-depends:
, base
, ghcup
Expand Down
1 change: 1 addition & 0 deletions lib-tui/GHCup/Brick/Actions.hs
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,7 @@ changelog' (_, ListResult {..}) = do
Darwin -> exec "open" [T.unpack $ decUTF8Safe $ serializeURIRef' uri] Nothing Nothing
Linux _ -> exec "xdg-open" [T.unpack $ decUTF8Safe $ serializeURIRef' uri] Nothing Nothing
FreeBSD -> exec "xdg-open" [T.unpack $ decUTF8Safe $ serializeURIRef' uri] Nothing Nothing
OpenBSD -> exec "xdg-open" [T.unpack $ decUTF8Safe $ serializeURIRef' uri] Nothing Nothing
Windows -> do
let args = "start \"\" " ++ (T.unpack $ decUTF8Safe $ serializeURIRef' uri)
c <- liftIO $ system $ args
Expand Down

0 comments on commit 03e7986

Please sign in to comment.