Skip to content
This repository was archived by the owner on Oct 7, 2020. It is now read-only.

Use floskell from hackage #1242

Merged
merged 1 commit into from
May 5, 2019
Merged

Use floskell from hackage #1242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,7 @@ defaults: &defaults
- ~/build/submodules/brittany/.stack-work
- ~/build/submodules/ghc-mod/core/.stack-work
- ~/build/submodules/ghc-mod/.stack-work
- ~/build/submodules/haskell-lsp/.stack-work
- ~/build/submodules/cabal-helper/.stack-work
- ~/build/submodules/floskell/.stack-work

- run:
name: Test
Expand Down
5 changes: 0 additions & 5 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,3 @@
# url = https://github.com/bubba/ghc-mod.git
url = https://github.com/alanz/ghc-mod.git


[submodule "submodules/floskell"]
path = submodules/floskell
url = https://github.com/ennocramer/floskell
# url = https://github.com/alanz/floskell
1 change: 0 additions & 1 deletion cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ packages:
./submodules/HaRe
./submodules/brittany
./submodules/cabal-helper/
./submodules/floskell
./submodules/ghc-mod/
./submodules/ghc-mod/core/

Expand Down
2 changes: 1 addition & 1 deletion haskell-ide-engine.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ library
, data-default
, directory
, filepath
, floskell
, floskell == 0.10.*
, fold-debounce
, ghc >= 8.0.1
, ghc-exactprint
Expand Down
2 changes: 1 addition & 1 deletion stack-8.2.1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ extra-deps:
- ./submodules/HaRe
- ./submodules/brittany
- ./submodules/cabal-helper
- ./submodules/floskell
- ./submodules/ghc-mod
- ./submodules/ghc-mod/core

Expand All @@ -16,6 +15,7 @@ extra-deps:
- cabal-plan-0.3.0.0
- constrained-dynamic-0.1.0.0
- czipwith-1.0.1.0
- floskell-0.10.0
- ghc-exactprint-0.5.8.2
- haddock-api-2.18.1
- haddock-library-1.4.4
Expand Down
2 changes: 1 addition & 1 deletion stack-8.2.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ extra-deps:
- ./submodules/HaRe
- ./submodules/brittany
- ./submodules/cabal-helper
- ./submodules/floskell
- ./submodules/ghc-mod
- ./submodules/ghc-mod/core

Expand All @@ -17,6 +16,7 @@ extra-deps:
- conduit-parse-0.2.1.0
- constrained-dynamic-0.1.0.0
- czipwith-1.0.1.0
- floskell-0.10.0
- ghc-exactprint-0.5.8.2
- haddock-api-2.18.1
- haddock-library-1.4.4
Expand Down
2 changes: 1 addition & 1 deletion stack-8.4.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ extra-deps:
- ./submodules/HaRe
- ./submodules/brittany
- ./submodules/cabal-helper
- ./submodules/floskell
- ./submodules/ghc-mod
- ./submodules/ghc-mod/core

# - brittany-0.11.0.0
- base-compat-0.9.3
- cabal-plan-0.3.0.0
- constrained-dynamic-0.1.0.0
- floskell-0.10.0
- ghc-exactprint-0.5.8.2
- haddock-api-2.20.0
- haddock-library-1.6.0
Expand Down
2 changes: 1 addition & 1 deletion stack-8.4.3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ extra-deps:
- ./submodules/HaRe
- ./submodules/brittany
- ./submodules/cabal-helper
- ./submodules/floskell
- ./submodules/ghc-mod
- ./submodules/ghc-mod/core

- base-compat-0.9.3
- cabal-plan-0.3.0.0
- constrained-dynamic-0.1.0.0
- floskell-0.10.0
- ghc-exactprint-0.5.8.2
- haddock-api-2.20.0
- haddock-library-1.6.0
Expand Down
2 changes: 1 addition & 1 deletion stack-8.4.4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ extra-deps:
- ./submodules/HaRe
- ./submodules/brittany
- ./submodules/cabal-helper
- ./submodules/floskell
- ./submodules/ghc-mod
- ./submodules/ghc-mod/core

# - brittany-0.11.0.0
- cabal-plan-0.4.0.0
- constrained-dynamic-0.1.0.0
- floskell-0.10.0
- ghc-exactprint-0.5.8.2
- haddock-api-2.20.0
- haddock-library-1.6.0
Expand Down
2 changes: 1 addition & 1 deletion stack-8.6.1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ extra-deps:
- ./submodules/HaRe
- ./submodules/brittany
- ./submodules/cabal-helper
- ./submodules/floskell
- ./submodules/ghc-mod
- ./submodules/ghc-mod/core

Expand All @@ -18,6 +17,7 @@ extra-deps:
- constrained-dynamic-0.1.0.0
- czipwith-1.0.1.1
- data-tree-print-0.1.0.2
- floskell-0.10.0
- haddock-api-2.21.0
- haskell-lsp-0.11.0.0
- haskell-lsp-types-0.11.0.0
Expand Down
2 changes: 1 addition & 1 deletion stack-8.6.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ extra-deps:
- ./submodules/HaRe
- ./submodules/brittany
- ./submodules/cabal-helper
- ./submodules/floskell
- ./submodules/ghc-mod
- ./submodules/ghc-mod/core

- butcher-1.3.2.1
- cabal-plan-0.4.0.0
- constrained-dynamic-0.1.0.0
- floskell-0.10.0
- haddock-api-2.21.0
- haskell-lsp-0.11.0.0
- haskell-lsp-types-0.11.0.0
Expand Down
2 changes: 1 addition & 1 deletion stack-8.6.3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ extra-deps:
- ./submodules/HaRe
- ./submodules/brittany
- ./submodules/cabal-helper
- ./submodules/floskell
- ./submodules/ghc-mod
- ./submodules/ghc-mod/core

- butcher-1.3.2.1
- cabal-plan-0.4.0.0
- constrained-dynamic-0.1.0.0
- floskell-0.10.0
- haddock-api-2.21.0
- haskell-lsp-0.11.0.0
- haskell-lsp-types-0.11.0.0
Expand Down
2 changes: 1 addition & 1 deletion stack-8.6.4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ extra-deps:
- ./submodules/HaRe
- ./submodules/brittany
- ./submodules/cabal-helper
- ./submodules/floskell
- ./submodules/ghc-mod
- ./submodules/ghc-mod/core

- butcher-1.3.2.1
- cabal-plan-0.4.0.0
- constrained-dynamic-0.1.0.0
- floskell-0.10.0
- haddock-api-2.22.0
- haskell-lsp-0.11.0.0
- haskell-lsp-types-0.11.0.0
Expand Down
2 changes: 1 addition & 1 deletion stack-8.6.5.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ extra-deps:
- ./submodules/HaRe
- ./submodules/brittany
- ./submodules/cabal-helper
- ./submodules/floskell
- ./submodules/ghc-mod
- ./submodules/ghc-mod/core

Expand All @@ -16,6 +15,7 @@ extra-deps:
- cabal-plan-0.4.0.0
- constrained-dynamic-0.1.0.0
- deque-0.2.7
- floskell-0.10.0
- ghc-exactprint-0.5.8.2
- haddock-api-2.22.0
- haskell-lsp-0.11.0.0
Expand Down
2 changes: 1 addition & 1 deletion stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ extra-deps:
- ./submodules/HaRe
- ./submodules/brittany
- ./submodules/cabal-helper
- ./submodules/floskell
- ./submodules/ghc-mod
- ./submodules/ghc-mod/core

Expand All @@ -16,6 +15,7 @@ extra-deps:
- cabal-plan-0.4.0.0
- constrained-dynamic-0.1.0.0
- deque-0.2.7
- floskell-0.10.0
- ghc-exactprint-0.5.8.2
- haddock-api-2.22.0
- haskell-lsp-0.11.0.0
Expand Down
1 change: 0 additions & 1 deletion submodules/floskell
Open in desktop
Submodule floskell deleted from 13af3d